From 6460ec9104cccc2873f0fe1d951e431ce95c4ca9 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 13 Jan 2011 10:20:17 +0000 Subject: [PATCH] Update to 2.033 - New upstream release 2.033 - Fixed typos and spelling errors (Perl RT#81816) - Use more explicit %files list - Simplify inclusion of IO::Compress::FAQ - Drop redundant explicit requires of Compress::Raw::{Bzip2,Zlib} - Drop installdirs patch, not needed with perl 5.12 - Default installdirs are perl, so no need to specify it explicitly - Make %summary less generic --- .gitignore | 3 +-- IO-Compress-2.024-Makefile.patch | 26 ------------------- perl-IO-Compress.spec | 43 ++++++++++++++++++++------------ sources | 2 +- 4 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 IO-Compress-2.024-Makefile.patch diff --git a/.gitignore b/.gitignore index 8dd2776..a1efbe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -IO-Compress-2.030.tar.gz -/IO-Compress-2.032.tar.gz +/IO-Compress-2.033.tar.gz diff --git a/IO-Compress-2.024-Makefile.patch b/IO-Compress-2.024-Makefile.patch deleted file mode 100644 index 147c44e..0000000 --- a/IO-Compress-2.024-Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up IO-Compress-2.024/Makefile.PL.old IO-Compress-2.024/Makefile.PL ---- IO-Compress-2.024/Makefile.PL.old 2010-01-07 17:49:39.000000000 +0100 -+++ IO-Compress-2.024/Makefile.PL 2010-04-12 13:27:17.744645137 +0200 -@@ -31,20 +31,8 @@ WriteMakefile( - : () } - ) - ), -- -- ( -- $] >= 5.005 -- ? (ABSTRACT => 'IO Interface to compressed data files/buffers', -- AUTHOR => 'Paul Marquess ') -- : () -- ), -- -- INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'), -- -- ( -- $] >= 5.009 && $] <= 5.011001 && ! $ENV{PERL_CORE} -- ? (INSTALLPRIVLIB => '$(INSTALLARCHLIB)') -- : () -+ INSTALLDIRS => 'perl', -+ ( - ), - - ((ExtUtils::MakeMaker->VERSION() gt '6.30') ? diff --git a/perl-IO-Compress.spec b/perl-IO-Compress.spec index acfdd39..0a210c0 100644 --- a/perl-IO-Compress.spec +++ b/perl-IO-Compress.spec @@ -2,22 +2,19 @@ %{?perl_default_filter} Name: perl-IO-Compress -Version: 2.032 +Version: 2.033 Release: 1%{?dist} -Summary: IO::Compress Perl module +Summary: Read and write compressed data License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-Compress/ Source0: http://www.cpan.org/authors/id/P/PM/PMQS/IO-Compress-%{version}.tar.gz -Patch0: IO-Compress-2.024-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Test::Pod), perl(Test::NoWarnings) BuildRequires: perl(Compress::Raw::Bzip2) >= %{version} BuildRequires: perl(Compress::Raw::Zlib) >= %{version} BuildRequires: perl(ExtUtils::MakeMaker) -Requires: perl(Compress::Raw::Bzip2) >= %{version} -Requires: perl(Compress::Raw::Zlib) >= %{version} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # this is wrapper for different Compress modules Provides: perl-Compress-Zlib = %{version}-%{release} @@ -46,28 +43,28 @@ included with the IO-Compress distribution: %prep %setup -q -n IO-Compress-%{version} -%patch0 -p1 -b .old + +# Remove spurious exec permissions chmod -x lib/IO/Uncompress/{Adapter/Identity,RawInflate}.pm find examples -type f -exec chmod -x {} + +# Fix shellbangs in examples %{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' examples/io/anycat \ examples/io/bzip2/* examples/io/gzip/* examples/compress-zlib/* -# https://rt.cpan.org/Public/Bug/Display.html?id=61402 -mv pod/FAQ.pod lib/IO/Compress ; %{__perl} -pi -e 's|pod/FAQ\.pod||' MANIFEST + +# Include IO::Compress::FAQ (#634722, CPAN RT#61402) +ln pod/FAQ.pod lib/IO/Compress/ %build -%{__perl} Makefile.PL INSTALLDIRS=perl +%{__perl} Makefile.PL make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT - make pure_install DESTDIR=$RPM_BUILD_ROOT - find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - -%{_fixperms} $RPM_BUILD_ROOT/* +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} \; 2>/dev/null +%{_fixperms} $RPM_BUILD_ROOT %check # Build using "--without long_tests" to avoid very long tests @@ -80,10 +77,24 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README examples/* -%{perl_privlib}/* -%{_mandir}/man3/* +%{perl_privlib}/Compress/ +%{perl_privlib}/File/ +%{perl_privlib}/IO/ +%{_mandir}/man3/Compress::Zlib.3pm* +%{_mandir}/man3/File::GlobMapper.3pm* +%{_mandir}/man3/IO::Compress::*.3pm* +%{_mandir}/man3/IO::Uncompress::*.3pm* %changelog +* Thu Jan 13 2011 Paul Howarth - 2.033-1 +- Update to 2.033 (fixed typos and spelling errors - Perl RT#81816) +- Use more explicit %%files list +- Simplify inclusion of IO::Compress::FAQ +- Drop redundant explicit requires of Compress::Raw::{Bzip2,Zlib} +- Drop installdirs patch, not needed with perl 5.12 +- Default installdirs are perl, so no need to specify it explicitly +- Make %%summary less generic + * Fri Jan 07 2011 Petr Pisar - 2.032-1 - 2.032 bump - Small improvements in spec file diff --git a/sources b/sources index 5ffaba3..4e1f2e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b16ac9f5fbb3b5c67294df3b39ce920d IO-Compress-2.032.tar.gz +3c9091f3b76219bd79070efb7db8c877 IO-Compress-2.033.tar.gz