Fix brp-compress to not compress non-info pages in info dir

This commit is contained in:
Denis Silakov 2013-12-13 06:50:15 -05:00
parent 07b6050d19
commit 2ace1cefbd
2 changed files with 18 additions and 1 deletions

View file

@ -0,0 +1,12 @@
diff -Naur rpm-5.4.10.orig/scripts/brp-compress rpm-5.4.10/scripts/brp-compress
--- rpm-5.4.10.orig/scripts/brp-compress 2013-12-13 06:40:15.038205610 -0500
+++ rpm-5.4.10/scripts/brp-compress 2013-12-13 06:31:28.000000000 -0500
@@ -12,7 +12,7 @@
COMPRESS_EXT=${COMPRESS_EXT:-.gz}
for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
- ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
+ ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info/*info* \
./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
./usr/share/doc/*/man/man* ./usr/lib/*/man/man*
do

View file

@ -59,7 +59,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}18
Release: %{?prereldate:0.%{prereldate}.}19
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -408,6 +408,10 @@ Patch504: rpm-5.4.10-postpone_subpackage_build_failures.patch
# the new one doesn't work in ROSA atm
Patch505: rpm-5.4.10-turn-back-urlgetfile.patch
# We have a case with maxima which installs maxima-index.list in _infodir
# and expects it to be uncompressed
Patch506: rpm-5.4.10-compress-info.patch
BuildRequires: autoconf >= 2.57
BuildRequires: bzip2-devel
BuildRequires: automake >= 1.8
@ -794,6 +798,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch503 -p1 -b .specspo~
%patch504 -p1 -b .postpone_errors~
%patch505 -p1 -b .urlgetfile~
%patch506 -p1 -b .compress_info~
#required by P55, P80, P81, P94..
./autogen.sh