commit a885b8870ba19f74761d8708e7b1f085a1b9a9a4 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sun Jan 15 11:55:38 2012 +0000 Update to 1.20 - Update to 1.20 (test suite fixes) - BR: perl(Carp), perl(Config), perl(Exporter) - Since upstream doesn't ship license files, neither should we - Make %files list more explicit - Use a patch to fix character encoding rather than scripted iconv - Use DESTDIR rather than PERL_INSTALL_ROOT - No need for additional filtering on top of %{?perl_default_filter} - Don't package INSTALL file .gitignore | 1 + Event-1.19-UTF8.patch | 14 +++++++ perl-Event.spec | 91 +++++++++++++++++++++--------------------------- sources | 2 +- 4 files changed, 56 insertions(+), 52 deletions(-) --- diff --git a/.gitignore b/.gitignore index a54019e..79b30f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Event-1.12.tar.gz /Event-1.15.tar.gz +/Event-1.20.tar.gz diff --git a/Event-1.19-UTF8.patch b/Event-1.19-UTF8.patch new file mode 100644 index 0000000..104a48f --- /dev/null +++ b/Event-1.19-UTF8.patch @@ -0,0 +1,14 @@ +--- Event/lib/Event.pod ++++ Event/lib/Event.pod +@@ -866,9 +866,9 @@ + + =head1 COPYRIGHT + +-Copyright � 1997 Joshua Nathaniel Pritikin & Graham Barr ++Copyright © 1997 Joshua Nathaniel Pritikin & Graham Barr + +-Copyright � 1998, 1999, 2000, 2001, 2002, 2003, 2004 Joshua Nathaniel Pritikin ++Copyright © 1998, 1999, 2000, 2001, 2002, 2003, 2004 Joshua Nathaniel Pritikin + + All rights reserved. This program is free software; you can + redistribute it and/or modify it under the same terms as Perl itself. diff --git a/perl-Event.spec b/perl-Event.spec index 33ae45e..4ce8691 100644 --- a/perl-Event.spec +++ b/perl-Event.spec @@ -1,26 +1,22 @@ Name: perl-Event -Version: 1.15 -Release: 3%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Event loop processing - Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Event/ Source0: http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/Event-%{version}.tar.gz -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - -BuildRequires: /usr/bin/iconv - +Patch0: Event-1.19-UTF8.patch +BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Time::HiRes) BuildRequires: perl(Test) >= 1 - +BuildRequires: perl(Time::HiRes) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Time::HiRes) -%{?perl_default_filter: -%filter_from_requires /perl(attrs)/d -%perl_default_filter -} +%{?perl_default_filter} %description The Event module provide a central facility to watch for various types of @@ -28,60 +24,53 @@ events and invoke a callback when these events occur. The idea is to delay the handling of events so that they may be dispatched in priority order when it is safe for callbacks to execute. - %prep %setup -q -n Event-%{version} -# generate our two licenses... -perldoc perlgpl > LICENSE.GPL -perldoc perlartistic > LICENSE.Artistic - -# appease rpmlint :) -find . -type f -exec chmod -c -x {} + -%{_fixperms} demo util -find t/ -type f -exec perl -pi -e 's|^#!\./perl|#!%{__perl}|' {} + - -# fix some other interperter issues.. -cd demo -perl -pi -e 's|#!./perl|#!%{__perl}|' *.t ../util/bench.pl +# Fix up permissions and shellbangs +find ./ -type f -exec chmod -c -x {} \; +perl -pi -e 's|#!./perl|#!/usr/bin/perl|' demo/*.t t/*.t util/bench.pl +%{_fixperms} demo/ util/ +# Fix character encoding +%patch0 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} -# not implemented yet, so lets avoid deps -cd demo -for i in *.pm ; do - mv $i $i.unimplemented -done - -# make sure the man page is UTF-8... -cd ../blib/man3 -iconv --from=ISO-8859-1 --to=UTF-8 Event.3pm > Event.3pm.new -mv Event.3pm.new Event.3pm - %install -make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + -find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} + -find %{buildroot} -type d -depth -exec rmdir --ignore-fail-on-non-empty {} + - -%{_fixperms} %{buildroot}/* - +make pure_install DESTDIR=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir --ignore-fail-on-non-empty {} ';' +%{_fixperms} %{buildroot} %check make test %files -%doc ANNOUNCE TODO README Tutorial.pdf ChangeLog demo/ util/ LICENSE* INSTALL -%doc t/ -%{perl_vendorarch}/auto/Event -%{perl_vendorarch}/Event* -%{_mandir}/man3/*.3* - +%doc ANNOUNCE ChangeLog README README.EV TODO +%doc Tutorial.pdf Tutorial.pdf-errata.txt demo/ t/ util/ +%doc %{perl_vendorarch}/Event.pod +%{perl_vendorarch}/auto/Event/ +%{perl_vendorarch}/Event.pm +%{perl_vendorarch}/Event/ +%{_mandir}/man3/Event.3pm* +%{_mandir}/man3/Event::MakeMaker.3pm* +%{_mandir}/man3/Event::generic.3pm* %changelog +* Sun Jan 15 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 1.20-1 +- update to 1.20 (test suite fixes) +- BR: perl(Carp), perl(Config), perl(Exporter) +- since upstream doesn't ship license files, neither should we +- make %%files list more explicit +- use a patch to fix character encoding rather than scripted iconv +- use DESTDIR rather than PERL_INSTALL_ROOT +- no need for additional filtering on top of %%{?perl_default_filter} +- don't package INSTALL file + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 08dc45e..0e54adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78830ea72145c0194fb5427859166152 Event-1.15.tar.gz +bdbdf6c1b235c3e13c25f3b0491c5134 Event-1.20.tar.gz
-- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel