From 52396413d2abaf6e35927383a699f0679d49b27d Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Nov 25 2011 14:13:46 +0000 Subject: - adjust font detection rules for libmagic change (#757105) --- diff --git a/rpm-4.9.x-fontattr.patch b/rpm-4.9.x-fontattr.patch new file mode 100644 index 0000000..efc8d97 --- /dev/null +++ b/rpm-4.9.x-fontattr.patch @@ -0,0 +1,15 @@ +commit fb30c0aac8b3da8c75a8cb1578a719ce38db59eb +Author: Panu Matilainen +Date: Fri Nov 25 16:07:38 2011 +0200 + + Identify "font collection" (data etc) as fonts also (RhBug:757105) + +diff --git a/fileattrs/font.attr b/fileattrs/font.attr +index 5c4c78f..8c19383 100644 +--- a/fileattrs/font.attr ++++ b/fileattrs/font.attr +@@ -1,3 +1,3 @@ + %__font_provides %{_rpmconfigdir}/fontconfig.prov + %__font_requires %{nil} +-%__font_magic ^.* [Ff]ont (program )?(text|data).*$ ++%__font_magic ^.* [Ff]ont (program|collection )?(text|data).*$ diff --git a/rpm.spec b/rpm.spec index e2721cd..658aca6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}4%{?dist} +Release: %{?snapver:0.%{snapver}.}5%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2 @@ -42,6 +42,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch Patch5: rpm-4.9.0-armhfp.patch # Patches already in upstream +Patch100: rpm-4.9.x-fontattr.patch # These are not yet upstream Patch301: rpm-4.6.0-niagara.patch @@ -215,6 +216,8 @@ packages on a system. %patch3 -p1 -b .no-man-dirs %patch4 -p1 -b .use-gpg2 +%patch100 -p1 -b .fontattr + %patch301 -p1 -b .niagara %patch302 -p1 -b .geode %patch303 -p1 -b .debuginfo-allnames @@ -439,6 +442,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Fri Nov 25 2011 Panu Matilainen - 4.9.1.2-5 +- adjust font detection rules for libmagic change (#757105) + * Wed Nov 09 2011 Dennis Gilmore - 4.9.1.2-4 - conditionally apply arm patch for hardfp on all arches but arm softfp ones