[packages/rpm] Fix generation of gstreamer deps

megabajt megabajt at pld-linux.org
Tue Sep 25 23:13:46 CEST 2012


commit d6a3678809fd6493fd13002d693338718e3342ed
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Tue Sep 25 23:13:11 2012 +0200

    Fix generation of gstreamer deps

 rpm-dont-treat-gstreamer-modules-as-font.patch | 11 +++++++++++
 rpm.spec                                       |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index ee77db9..81ddcaf 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -137,6 +137,7 @@ Patch46:	%{name}-file-magic-can-be-mixed-case.patch
 Patch47:	%{name}-query-file-always-noisy.patch
 Patch48:	%{name}-verify-ghosts-broken-logic.patch
 Patch49:	%{name}-python-enable-compat-RPMSENSE.patch
+Patch50:	%{name}-dont-treat-gstreamer-modules-as-font.patch
 
 # Patches imported from Mandriva
 
@@ -812,6 +813,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-dont-treat-gstreamer-modules-as-font.patch b/rpm-dont-treat-gstreamer-modules-as-font.patch
new file mode 100644
index 0000000..36c7617
--- /dev/null
+++ b/rpm-dont-treat-gstreamer-modules-as-font.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/lib/rpmfc.c.old	2012-09-25 22:34:46.184039778 +0200
++++ rpm-5.4.10/lib/rpmfc.c	2012-09-25 22:35:21.947179368 +0200
+@@ -921,7 +921,7 @@ static int rpmfcSCRIPT(rpmfc fc)
+ #endif
+ 	    xx = rpmfcHelper(fc, 'R', "ruby");
+     } else
+-    if (fc->fcolor->vals[fc->ix] & RPMFC_FONT) {
++    if ((fc->fcolor->vals[fc->ix] & RPMFC_FONT) == RPMFC_FONT) {
+        xx = rpmfcHelper(fc, 'P', "font");
+        /* XXX: currently of no use, but for the sake of consistency... */
+        xx = rpmfcHelper(fc, 'R', "font");
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list