rpms/rpm/devel rpm-4.6.0-rc1-file-debuginfo.patch, NONE, 1.1 rpm.spec, 1.304, 1.305

Panu Matilainen pmatilai at fedoraproject.org
Fri Oct 31 08:23:19 UTC 2008


Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8713

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-rc1-file-debuginfo.patch 
Log Message:
- adjust find-debuginfo for "file" output change (#468129)


rpm-4.6.0-rc1-file-debuginfo.patch:

--- NEW FILE rpm-4.6.0-rc1-file-debuginfo.patch ---
commit 81660b26bc8e2c03f55cf928955f7ed84e00785a
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Fri Oct 31 10:17:07 2008 +0200

    Adjust for file output change (rhbz#468129)
    - file util used reported file details along with mime type, newer ones don't

diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 287c512..21366bf 100644
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -90,7 +90,7 @@ strip_to_debug()
 {
   local g=
   $strip_g && case "$(file -bi "$2")" in
-  application/x-sharedlib,*) g=-g ;;
+  application/x-sharedlib*) g=-g ;;
   esac
   eu-strip --remove-comment $g -f "$1" "$2" || exit
 }


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- rpm.spec	28 Oct 2008 14:24:04 -0000	1.304
+++ rpm.spec	31 Oct 2008 08:22:48 -0000	1.305
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.6
+Release: 0.%{snapver}.7
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -38,6 +38,7 @@
 Patch202: rpm-4.6.0-rc1-noarch-subpkg.patch
 Patch203: rpm-4.6.0-rc1-defaultdocdir.patch
 Patch204: rpm-4.6.0-rc1-fp-hash.patch
+Patch205: rpm-4.6.0-rc1-file-debuginfo.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -176,6 +177,7 @@
 %patch202 -p1 -b .noarch-subpkg
 %patch203 -p1 -b .defaultdocdir
 %patch204 -p1 -b .fp-hash
+%patch205 -p1 -b .file-debuginfo
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -366,6 +368,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Oct 31 2008 Panu Matilainen <pmatilai at redhat.com>
+- adjust find-debuginfo for "file" output change (#468129)
+
 * Tue Oct 28 2008 Panu Matilainen <pmatilai at redhat.com>
 - Florian's improved fingerprinting hash algorithm from upstream
 




More information about the fedora-extras-commits mailing list