commit 1786691b14cf0364674d4b241c79087d8bb54a0f
Merge: 0c76d66 30abbfb
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Feb 13 12:04:08 2014 +0000
Merge branch 'master' into el5 and reinstate EPEL-5 compatibility
Conflicts:
.gitignore
.gitignore | 2 +-
perl-Class-MethodMaker.spec | 207 +++++++++++++++++++++++++++++++++++++------
sources | 2 +-
3 files changed, 180 insertions(+), 31 deletions(-)
---
diff --cc .gitignore
index 7ba99d3,8a90de6..f5d9d5d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Class-MethodMaker-2.08.tar.gz
-/Class-MethodMaker-2.20.tar.gz
++/Class-MethodMaker-[0-9.]*.tar.gz
diff --cc perl-Class-MethodMaker.spec
index da7b9a0,98a1419..fe83e1e
--- a/perl-Class-MethodMaker.spec
+++ b/perl-Class-MethodMaker.spec
@@@ -1,22 -1,66 +1,63 @@@
- %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
Name: perl-Class-MethodMaker
- Version: 2.08
- Release: 4%{?dist}
+ Version: 2.20
-Release: 1%{?dist}
++Release: 2%{?dist}
Summary: Perl module for creating generic object-oriented methods
Group: Development/Libraries
- License: GPL or Artistic
- URL: http://search.cpan.org/dist/Class-MethodMaker/
- Source: http://www.cpan.org/authors/id/F/FL/FLUFFY/Class-MethodMaker-2.08.tar.gz
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
- BuildRequires: perl >= 1:5.6.1
+ License: GPL+ or Artistic
+ URL: http://search.cpan.org/~schwigon/Class-MethodMaker/
+ Source0: http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz
++BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+
+ BuildRequires: perl
+ BuildRequires: perl(Config)
+ BuildRequires: perl(constant)
+ BuildRequires: perl(ExtUtils::MakeMaker)
+ BuildRequires: perl(File::Basename)
+ BuildRequires: perl(File::Find)
+ BuildRequires: perl(File::Spec::Functions)
+ BuildRequires: perl(Getopt::Long)
+ BuildRequires: perl(strict)
+ # Run-time
+ BuildRequires: perl(AutoLoader) >= 5.57
+ BuildRequires: perl(base)
+ BuildRequires: perl(Carp)
+ BuildRequires: perl(Exporter)
+ BuildRequires: perl(warnings)
+ BuildRequires: perl(warnings::register)
+ BuildRequires: perl(XSLoader)
+ # Required by the tests
+ BuildRequires: perl(B::Deparse) >= 0.59
+ BuildRequires: perl(Cwd) >= 2.01
+ BuildRequires: perl(Data::Dumper)
+ BuildRequires: perl(Env)
+ BuildRequires: perl(ExtUtils::testlib)
+ BuildRequires: perl(Fatal) >= 1.02
+ BuildRequires: perl(Fcntl) >= 1.03
+ BuildRequires: perl(File::Compare) >= 1.1002
+ BuildRequires: perl(File::Path) >= 1.04.01
+ BuildRequires: perl(File::Spec) >= 0.6
+ BuildRequires: perl(File::stat)
+ BuildRequires: perl(FindBin) >= 1.42
+ BuildRequires: perl(IO::File) >= 1.08
BuildRequires: perl(IPC::Run)
- Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+ BuildRequires: perl(lib)
+ BuildRequires: perl(POSIX) >= 1.03
+ BuildRequires: perl(Test) >= 1.12.2
+ BuildRequires: perl(Tie::Array)
+ BuildRequires: perl(Tie::Hash)
+ BuildRequires: perl(Tie::RefHash)
+ BuildRequires: perl(Tie::Scalar)
+ BuildRequires: perl(Tie::StdArray)
+ BuildRequires: perl(Tie::StdHash)
+ BuildRequires: perl(Tie::StdScalar)
+ BuildRequires: perl(vars)
+
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: perl(B::Deparse)
-Requires: perl(Data::Dumper)
-
-%{?perl_default_filter}
-# Remove under-specified dependencies
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(AutoLoader\\)$
++Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
++Requires: perl(B::Deparse)
++Requires: perl(Data::Dumper)
%description
-
Class::MethodMaker solves the problem of having to continually write accessor
methods for your objects that perform standard tasks.
@@@ -24,34 -68,128 +65,142 @@@
%setup -q -n Class-MethodMaker-%{version}
%build
- CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
- %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
- make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
++perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+ make %{?_smp_mflags}
%install
- rm -rf $RPM_BUILD_ROOT
--make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
--find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-- -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
--find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
--chmod -R u+w $RPM_BUILD_ROOT/*
-
- %check || :
- mv t/0-signature.t t/0-signature.t.skip
++rm -rf %{buildroot}
++make pure_install DESTDIR=%{buildroot}
++find %{buildroot} -type f -name .packlist -exec rm -f {} \;
++find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
++%{_fixperms} %{buildroot}
+
+ %check
make test
+%clean
- rm -rf $RPM_BUILD_ROOT
-
++rm -rf %{buildroot}
+
%files
- %defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorarch}/Class/
--%{perl_vendorarch}/auto/*
--%{_mandir}/man3/*.3*
++%{perl_vendorarch}/auto/Class/
++%{_mandir}/man3/Class::MethodMaker.3pm*
++%{_mandir}/man3/Class::MethodMaker::Constants.3pm*
++%{_mandir}/man3/Class::MethodMaker::Engine.3pm*
++%{_mandir}/man3/Class::MethodMaker::OptExt.3pm*
++%{_mandir}/man3/Class::MethodMaker::V1Compat.3pm*
++%{_mandir}/man3/Class::MethodMaker::array.3pm*
++%{_mandir}/man3/Class::MethodMaker::hash.3pm*
++%{_mandir}/man3/Class::MethodMaker::scalar.3pm*
%changelog
++* Thu Feb 13 2014 Paul Howarth <paul@xxxxxxxxxxxx> - 2.20-2
++- Reinstate EPEL-5 compatibility
++- Minor spec cleanup
++
+ * Thu Feb 13 2014 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.20-1
+ - Upstream update.
+ - Minor spec cleanup.
+
+ * Thu Dec 26 2013 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.19-1
+ - Upstream update.
+ - Fix up Source0:-URL.
+ - Rework spec.
+
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.18-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+ * Thu Jul 18 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 2.18-8
+ - Perl 5.18 rebuild
+ - Specify all dependencies
+
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.18-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.18-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+ * Tue Jun 12 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 2.18-5
+ - Perl 5.16 rebuild
+ - Specify all dependencies
+
+ * Sun Jan 22 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.18-4
+ - Add %%{perl_default_filter}.
+
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.18-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+ * Fri Jun 24 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 2.18-2
+ - Perl mass rebuild
+
+ * Sun Apr 17 2011 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.18-1
+ - Upstream update.
+
+ * Mon Mar 28 2011 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.17-1
+ - Upstream update.
+ - Spec file cleanup.
+
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.16-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+ * Wed Dec 15 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 2.16-3
-- 661697 rebuild for fixing problems with vendorach/lib
++- Rebuild to fix problems with vendorarch/lib (#661697)
+
+ * Tue May 18 2010 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.16-2
+ - Rebuild with perl-5.12.0.
+
+ * Tue May 18 2010 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.16-1
+ - Upstream update.
+
+ * Fri Apr 30 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 2.15-4
+ - Mass rebuild with perl-5.12.0
+
+ * Fri Dec 4 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 2.15-3
+ - rebuild against perl 5.10.1
+
+ * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.15-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+ * Sun Mar 01 2009 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.15-1
+ - Upstream update.
+ - Build in subdir to work-around rpm breaking the testsuite.
+
+ * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+ * Sat Dec 20 2008 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.13-1
+ - Upstream update.
+
+ * Fri Sep 5 2008 Daniel P. Berrange <berrange@xxxxxxxxxx> - 2.12-1
+ - Update to new release for rhbz #461285
+
+ * Fri Jul 18 2008 Ralf Corsépius <rc040203@xxxxxxxxxx> - 2.11-1
+ - Upstream update.
+
+ * Fri Jul 18 2008 Ralf Corsépius <rc040203@xxxxxxxxxx> - 2.10-4
+ - Remove %%clean ||: (BZ 449442, FTBFS).
+ - Use %%version in Source0-URL.
+ - Don't skip 0-signature.t.
+ - Misc. minor spec-file overhaul.
+
+ * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 2.10-3
+ - Rebuild for perl 5.10 (again)
+
+ * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxx> - 2.10-2
+ - Autorebuild for GCC 4.3
+
+ * Tue Jan 29 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 2.10-1
+ - fix compile bug by going to 2.10 (CPAN says it is unauthorized,
+ but the copyright holder says it is ok)
+
+ * Mon Jan 28 2008 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 2.08-5
+ - rebuild for new perl
+
+ * Mon Oct 15 2007 Tom "spot" Callaway <tcallawa@xxxxxxxxxx> - 2.08-4.1
+ - correct license tag
+ - add BR: perl(ExtUtils::MakeMaker)
+
* Fri Feb 17 2006 Dennis Gregorovic <dgregor@xxxxxxxxxx> - 2.08-4
- Rebuild for FC6
--
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
