rpms/perl
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix Compress-Raw-Bzip2 packaging

Browse Source 
and ensure that we never bundle bzip2 or zlib
This commit is contained in:
Iain Arnell 2011-07-29 09:48:20 +02:00
parent 0100927b79
commit 93b5b8981d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
perl.spec
View File

@ -66,7 +66,7 @@ Patch8: perl-5.14.1-offtest.patch
# Update some of the bundled modules # Update some of the bundled modules
# see http://fedoraproject.org/wiki/Perl/perl.spec for instructions # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
BuildRequires: db4-devel, gdbm-devel, groff, tcsh, zlib-devel, systemtap-sdt-devel BuildRequires: db4-devel, gdbm-devel, groff, tcsh, zlib-devel, bzip2-devel, systemtap-sdt-devel
# For tests # For tests
BuildRequires: procps, rsyslog BuildRequires: procps, rsyslog
@ -1082,6 +1082,11 @@ sed -i 's|BUILD_ZLIB = True|BUILD_ZLIB = False|
s|LIB = ./zlib-src|LIB = %{_libdir}|' \ s|LIB = ./zlib-src|LIB = %{_libdir}|' \
cpan/Compress-Raw-Zlib/config.in cpan/Compress-Raw-Zlib/config.in
# Ensure that we never accidentally bundle zlib or bzip2
rm -rf cpan/Compress-Raw-Zlib/zlib-src
rm -rf cpan/Compress-Raw-Bzip2/bzip2-src
sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST
%build %build
echo "RPM Build arch: %{_arch}" echo "RPM Build arch: %{_arch}"
@ -1150,6 +1155,10 @@ echo "RPM Build arch: %{_arch}"
# -Duseshrplib creates libperl.so, -Ubincompat5005 help create DSO -> libperl.so # -Duseshrplib creates libperl.so, -Ubincompat5005 help create DSO -> libperl.so
BUILD_BZIP2=0
BZIP2_LIB=%{_libdir}
export BUILD_BZIP2 BZIP2_LIB
%ifarch sparc64 %{arm} %ifarch sparc64 %{arm}
make make
%else %else
@ -1394,7 +1403,6 @@ sed \
%exclude %{archlib}/auto/Compress/Raw/ %exclude %{archlib}/auto/Compress/Raw/
%exclude %{archlib}/auto/Compress/Raw/Zlib/ %exclude %{archlib}/auto/Compress/Raw/Zlib/
%exclude %{_mandir}/man3/Compress::Raw::Zlib* %exclude %{_mandir}/man3/Compress::Raw::Zlib*
%exclude %{_mandir}/man3/Compress::Raw::Bzip2*
# Digest::SHA # Digest::SHA
%exclude %{_bindir}/shasum %exclude %{_bindir}/shasum
@ -1730,11 +1738,16 @@ sed \
%files Compress-Raw-Bzip2 %files Compress-Raw-Bzip2
%dir %{archlib}/Compress %dir %{archlib}/Compress
%dir %{archlib}/Compress/Raw
%{archlib}/Compress/Raw/Bzip2.pm %{archlib}/Compress/Raw/Bzip2.pm
%dir %{archlib}/auto/Compress/
%dir %{archlib}/auto/Compress/Raw/
%{archlib}/auto/Compress/Raw/Bzip2/
%{_mandir}/man3/Compress::Raw::Bzip2* %{_mandir}/man3/Compress::Raw::Bzip2*
%files Compress-Raw-Zlib %files Compress-Raw-Zlib
%dir %{archlib}/Compress %dir %{archlib}/Compress
%dir %{archlib}/Compress/Raw
%{archlib}/Compress/Raw/Zlib.pm %{archlib}/Compress/Raw/Zlib.pm
%dir %{archlib}/auto/Compress/ %dir %{archlib}/auto/Compress/
%dir %{archlib}/auto/Compress/Raw/ %dir %{archlib}/auto/Compress/Raw/