]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- properly generate verify flags at package built time auto/th/rpm-5.4.10-23
authorJan Rękorajski <baggins@pld-linux.org>
Mon, 22 Oct 2012 11:21:59 +0000 (13:21 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Mon, 22 Oct 2012 11:21:59 +0000 (13:21 +0200)
- rel 23

rpm-fix-filedigests-verify.patch [new file with mode: 0644]
rpm.spec

diff --git a/rpm-fix-filedigests-verify.patch b/rpm-fix-filedigests-verify.patch
new file mode 100644 (file)
index 0000000..755848f
--- /dev/null
@@ -0,0 +1,10 @@
+--- rpm-5.4.10.orig/build/files.c      2012-10-15 23:29:13.601832730 +0200
++++ rpm-5.4.10/build/files.c   2012-10-15 23:29:50.264308164 +0200
+@@ -393,7 +393,6 @@
+               if (strcmp(p, vfa->attribute))
+                   /*@innercontinue@*/ continue;
+               verifyFlags |= vfa->flag;
+-                  verifyFlags &= ~RPMVERIFY_FDIGEST;
+               /*@innerbreak@*/ break;
+           }
+           if (vfa->attribute)
index 1760001c4da41131dcdb52df9952d0ede499ac6a..5d8b6c73fd90b857d65c117dfe58504db516a704 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       22
+Release:       23
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -143,6 +143,7 @@ Patch50:    %{name}-dont-treat-gstreamer-modules-as-font.patch
 Patch51:       %{name}-gst-inspect-typo.patch
 Patch52:       %{name}-null-term-ascii-digest.patch
 Patch53:       %{name}-lua-enable-extra-libs.patch
+Patch54:       %{name}-fix-filedigests-verify.patch
 
 # Patches imported from Mandriva
 
@@ -830,6 +831,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch51 -p1
 %patch52 -p0
 %patch53 -p1
+%patch54 -p1
 
 %patch1000 -p1
 %patch1001 -p1
This page took 0.046688 seconds and 4 git commands to generate.