[perl/f14] Every Fedora has different paths -> remove dirs, which were added in previous commit. Add missing fi
Marcela Mašláňová
mmaslano at fedoraproject.org
Fri Jun 24 12:22:42 UTC 2011
commit 65feec9782c8d16051688a5b99ea3513634f858b
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date: Fri Jun 24 14:22:09 2011 +0200
Every Fedora has different paths -> remove dirs, which were added in
previous commit.
Add missing files IO::Compress::Bzip2 into IO::Compress
perl.spec | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/perl.spec b/perl.spec
index 8b3407c..7d083c1 100644
--- a/perl.spec
+++ b/perl.spec
@@ -12,7 +12,7 @@
Name: perl
Version: %{perl_version}
# release number must be even higher, becase dual-lived modules will be broken otherwise
-Release: 145%{?dist}
+Release: 146%{?dist}
Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language
Group: Development/Languages
@@ -1087,10 +1087,6 @@ do
%{new_perl} %{build_bindir}/h2ph -a -d %{build_archlib} $i || true
done
-# vendor directories (in this case for third party rpms)
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorarch}
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}
-
#
# libnet configuration file
#
@@ -1202,12 +1198,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{privlib}
%{archlib}
-%{perl_vendorlib}
-%{_prefix}/local/share/perl5
# libs
%exclude %{archlib}/CORE/libperl.so
-%exclude %{perl_vendorarch}
# devel
%exclude %{_bindir}/enc2xs
@@ -1356,20 +1349,24 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{privlib}/IO/Compress/Gzip/
%exclude %{privlib}/IO/Compress/Gzip.pm
%exclude %{privlib}/IO/Compress/RawDeflate.pm
+%exclude %{privlib}/IO/Compress/Bzip2.pm
%exclude %{privlib}/IO/Compress/Zip/
%exclude %{privlib}/IO/Compress/Zip.pm
%exclude %{privlib}/IO/Compress/Zlib/
%exclude %{privlib}/IO/Uncompress/Adapter/
%exclude %{privlib}/IO/Uncompress/AnyInflate.pm
+%exclude %{privlib}/IO/Uncompress/Bunzip2.pm
%exclude %{privlib}/IO/Uncompress/Gunzip.pm
%exclude %{privlib}/IO/Uncompress/Inflate.pm
%exclude %{privlib}/IO/Uncompress/RawInflate.pm
%exclude %{privlib}/IO/Uncompress/Unzip.pm
%exclude %{_mandir}/man3/IO::Compress::Deflate*
+%exclude %{_mandir}/man3/IO::Compress::Bzip2*
%exclude %{_mandir}/man3/IO::Compress::Gzip*
%exclude %{_mandir}/man3/IO::Compress::RawDeflate*
%exclude %{_mandir}/man3/IO::Compress::Zip*
%exclude %{_mandir}/man3/IO::Uncompress::AnyInflate*
+%exclude %{_mandir}/man3/IO::Uncompress::Bunzip2*
%exclude %{_mandir}/man3/IO::Uncompress::Gunzip*
%exclude %{_mandir}/man3/IO::Uncompress::Inflate*
%exclude %{_mandir}/man3/IO::Uncompress::RawInflate*
@@ -1515,9 +1512,6 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(-,root,root)
%{archlib}/CORE/libperl.so
-%dir %{archlib}
-%dir %{perl_vendorarch}
-%dir %{_prefix}/local/%{_lib}/perl5
%files devel
%defattr(-,root,root,-)
@@ -1681,6 +1675,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{privlib}/IO/Compress/Adapter/
%{privlib}/IO/Compress/Deflate.pm
+%{privlib}/IO/Compress/Bzip2.pm
%{privlib}/IO/Compress/Gzip/
%{privlib}/IO/Compress/Gzip.pm
%{privlib}/IO/Compress/RawDeflate.pm
@@ -1689,15 +1684,18 @@ rm -rf $RPM_BUILD_ROOT
%{privlib}/IO/Compress/Zlib/
%{privlib}/IO/Uncompress/Adapter/
%{privlib}/IO/Uncompress/AnyInflate.pm
+%{privlib}/IO/Uncompress/Bunzip2.pm
%{privlib}/IO/Uncompress/Gunzip.pm
%{privlib}/IO/Uncompress/Inflate.pm
%{privlib}/IO/Uncompress/RawInflate.pm
%{privlib}/IO/Uncompress/Unzip.pm
%{_mandir}/man3/IO::Compress::Deflate*
%{_mandir}/man3/IO::Compress::Gzip*
+%{_mandir}/man3/IO::Compress::Bzip2*
%{_mandir}/man3/IO::Compress::RawDeflate*
%{_mandir}/man3/IO::Compress::Zip*
%{_mandir}/man3/IO::Uncompress::AnyInflate*
+%{_mandir}/man3/IO::Uncompress::Bunzip2*
%{_mandir}/man3/IO::Uncompress::Gunzip*
%{_mandir}/man3/IO::Uncompress::Inflate*
%{_mandir}/man3/IO::Uncompress::RawInflate*
@@ -1882,6 +1880,11 @@ rm -rf $RPM_BUILD_ROOT
# Old changelog entries are preserved in CVS.
%changelog
+* Fri Jun 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.12.4-146
+- every Fedora has different paths -> remove dirs, which were added in
+ previous commit
+- add missing files IO::Compress::Bzip2 into IO::Compress
+
* Wed Jun 22 2011 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.12.4-145
- update to minor update release 5.12.4
- Upstream changes: remove patch for lc tainting RT #87336,
More information about the scm-commits
mailing list