[packages/rpm] - properly generate verify flags at package built time - rel 23

[baggins]

commit 330093faff6d869f3b3c708de684851bb26fa8ca
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 22 13:21:59 2012 +0200

    - properly generate verify flags at package built time
    - rel 23

 rpm-fix-filedigests-verify.patch | 10 ++++++++++
 rpm.spec                         |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 1760001..5d8b6c7 100644
--- 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
diff --git a/rpm-fix-filedigests-verify.patch b/rpm-fix-filedigests-verify.patch
new file mode 100644
index 0000000..755848f
--- /dev/null
+++ b/rpm-fix-filedigests-verify.patch
@@ -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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/330093faff6d869f3b3c708de684851bb26fa8ca