- file returns "XZ compressed data" for .xz archives, so let grep

  recognize it properly

diff --git a/rpm-file-magic-can-be-mixed-case.patch b/rpm-file-magic-can-be-mixed-case.patch
new file mode 100644 (file)
index 0000000..9536124
--- /dev/null
+++ b/rpm-file-magic-can-be-mixed-case.patch
@@ -0,0 +1,20 @@
+--- rpm-5.4.10/scripts/rpm2cpio~       2009-03-19 02:01:24.000000000 +0100
++++ rpm-5.4.10/scripts/rpm2cpio        2012-09-18 23:49:28.261438724 +0200
+@@ -25,13 +25,13 @@
+ EXTRACTOR="dd if=$pkg ibs=$o skip=1"
+ 
+ COMPRESSION=`($EXTRACTOR |file -) 2>/dev/null`
+-if echo $COMPRESSION |grep -q gzip; then
++if echo $COMPRESSION |grep -qi gzip; then
+       DECOMPRESSOR=gunzip
+-elif echo $COMPRESSION |grep -q bzip2; then
++elif echo $COMPRESSION |grep -qi bzip2; then
+       DECOMPRESSOR=bunzip2
+-elif echo $COMPRESSION |grep -q xz; then
++elif echo $COMPRESSION |grep -qi xz; then
+       DECOMPRESSOR=unxz
+-elif echo $COMPRESSION |grep -q cpio; then
++elif echo $COMPRESSION |grep -qi cpio; then
+       DECOMPRESSOR=cat
+ else
+       # Most versions of file don't support LZMA, therefore we assume

diff --git a/rpm.spec b/rpm.spec
index b876446c90b6a58cfed27208921ae05eef62d38e..3e108448c4e552c710ea6a68574914ea1aa574d1 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -125,6 +125,7 @@ Patch45:    %{name}-pattern_Release.patch
 Patch46:       %{name}-fix-___build_pre-macro.patch
 Patch47:       %{name}-missing-patch-file-fails-build.patch
 Patch48:       %{name}-remove-misleading-missing-patch-message.patch
+Patch49:       %{name}-file-magic-can-be-mixed-case.patch
 
 # Patches imported from Mandriva
 
@@ -794,6 +795,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%patch49 -p1
 
 %patch1000 -p1
 %patch1001 -p1