[perl-Sub-Identify] Spec clean-up
by Paul Howarth
commit edac6fde7a1291e8c7b2c9eae180889b035f18f1
Author: Paul Howarth <paul(a)city-fan.org>
Date: Mon Mar 5 15:51:28 2012 +0000
Spec clean-up
- Use %{optflags}
- BR: perl(Exporter) and perl(Test::Pod)
- Make %files list more explicit
- Use DESTDIR rather than PERL_INSTALL_ROOT
- No need to remove empty directories from buildroot
- Don't use macros for commands
- Use tabs
.gitignore | 2 +-
perl-Sub-Identify.spec | 105 ++++++++++++++++++++++++++----------------------
2 files changed, 58 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 081d739..fc0afde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Sub-Identify-0.04.tar.gz
+/Sub-Identify-[0-9.]*.tar.gz
diff --git a/perl-Sub-Identify.spec b/perl-Sub-Identify.spec
index d184b3a..3273671 100644
--- a/perl-Sub-Identify.spec
+++ b/perl-Sub-Identify.spec
@@ -1,41 +1,41 @@
-Name: perl-Sub-Identify
-Version: 0.04
-Release: 12%{?dist}
-Summary: Retrieve names of code references
-License: GPL+ or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/Sub-Identify/
-Source0: http://www.cpan.org/authors/id/R/RG/RGARCIA/Sub-Identify-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(Test::More)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
+Name: perl-Sub-Identify
+Version: 0.04
+Release: 13%{?dist}
+Summary: Retrieve names of code references
+License: GPL+ or Artistic
+Group: Development/Libraries
+URL: http://search.cpan.org/dist/Sub-Identify/
+Source0: http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Sub-Identify-%{versio...
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod)
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+# Don't provide private perl libs
%{?perl_default_filter}
%description
Sub::Identify allows you to retrieve the real name of code references. For
-this, it uses perl's introspection mechanism, provided by the B module.
+this, it uses Perl's introspection mechanism, provided by the B module.
%prep
%setup -q -n Sub-Identify-%{version}
-perl -pi -e 's|^#!perl|#!%{__perl}|' t/*
+# Fix script interpreters
+perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+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 {} 2>/dev/null \;
-
-%{_fixperms} %{buildroot}/*
+%{_fixperms} %{buildroot}
%check
make test
@@ -46,11 +46,20 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changes t/
-%{perl_vendorarch}/*
-%exclude %dir %{perl_vendorarch}/auto/
-%{_mandir}/man3/*.3*
+%{perl_vendorarch}/auto/Sub/
+%{perl_vendorarch}/Sub/
+%{_mandir}/man3/Sub::Identify.3pm*
%changelog
+* Mon Mar 5 2012 Paul Howarth <paul(a)city-fan.org> - 0.04-13
+- Use %%{optflags}
+- BR: perl(Exporter) and perl(Test::Pod)
+- Make %%files list more explicit
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- No need to remove empty directories from buildroot
+- Don't use macros for commands
+- Use tabs
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.04-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -61,16 +70,16 @@ rm -rf %{buildroot}
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Dec 22 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 0.04-9
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
* Thu May 06 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 0.04-8
- Mass rebuild with perl-5.12.0
* Mon Dec 7 2009 Stepan Kasal <skasal(a)redhat.com> - 0.04-7
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
-* Fri Aug 28 2009 Chris Weyl <cweyl(a)alumni.drew.edu> 0.04-6
-- bump
+* Fri Aug 28 2009 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.04-6
+- Bump
* Thu Aug 27 2009 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.04-5
- Filtering errant private provides
@@ -81,28 +90,28 @@ rm -rf %{buildroot}
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.04-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Wed Feb 11 2009 Chris Weyl <cweyl(a)alumni.drew.edu> 0.04-2
-- aaaand change files to look in the the arch-dependent dirs
+* Wed Feb 11 2009 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.04-2
+- Aaaand change files to look in the the arch-dependent dirs
-* Wed Feb 11 2009 Chris Weyl <cweyl(a)alumni.drew.edu> 0.04-1
-- update to 0.04
-- drop buildarch noarch, as we have some XS bits now
+* Wed Feb 11 2009 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.04-1
+- Update to 0.04
+- Drop buildarch noarch, as we have some XS bits now
-* Wed May 28 2008 Chris Weyl <cweyl(a)alumni.drew.edu> 0.03-1
-- update to 0.03
+* Wed May 28 2008 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.03-1
+- Update to 0.03
-* Tue Mar 04 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.02-3
-- rebuild for new perl
+* Tue Mar 04 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.02-3
+- Rebuild for new perl
-* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.02-2.2
-- add BR: perl(Test::More)
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.02-2.2
+- Add BR: perl(Test::More)
-* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.02-2.1
-- correct license tag
-- add BR: perl(ExtUtils::MakeMaker)
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.02-2.1
+- Correct license tag
+- Add BR: perl(ExtUtils::MakeMaker)
-* Wed Sep 06 2006 Chris Weyl <cweyl(a)alumni.drew.edu> 0.02-2
-- bump
+* Wed Sep 06 2006 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.02-2
+- Bump
-* Tue Sep 05 2006 Chris Weyl <cweyl(a)alumni.drew.edu> 0.02-1
-- Specfile autogenerated by cpanspec 1.69.1.
+* Tue Sep 05 2006 Chris Weyl <cweyl(a)alumni.drew.edu> - 0.02-1
+- Specfile autogenerated by cpanspec 1.69.1
12 years, 3 months
[perl-Package-DeprecationManager] Update to 0.12
by Paul Howarth
commit da2d63dc235b557b1139091c6b09966eb8bb1561
Author: Paul Howarth <paul(a)city-fan.org>
Date: Mon Mar 5 10:50:34 2012 +0000
Update to 0.12
- New upstream release 0.12:
- Fix tests to pass with Carp 1.25 (CPAN RT#75520)
- BR: perl(Test::Spelling), aspell-en
- Add patch to accept "deprecations" as a valid dictionary word
- Update patches to apply cleanly
- Don't need to remove empty directories from buildroot
- Don't use macros for commands
- Drop EPEL-4 support:
- Drop patch supporting build with ExtUtils::MakeMaker < 6.30
Package-DeprecationManager-0.11-old-EU::MM.patch | 30 ----------
...ge-DeprecationManager-0.11-old-Test::More.patch | 56 ------------------
...DeprecationManager-0.12-no-Test::Requires.patch | 6 +-
...ge-DeprecationManager-0.12-old-Test::More.patch | 60 ++++++++++++++++++++
Package-DeprecationManager-0.12-stopwords.patch | 7 ++
perl-Package-DeprecationManager.spec | 48 +++++++++-------
sources | 2 +-
7 files changed, 98 insertions(+), 111 deletions(-)
---
diff --git a/Package-DeprecationManager-0.10-no-Test::Requires.patch b/Package-DeprecationManager-0.12-no-Test::Requires.patch
similarity index 62%
rename from Package-DeprecationManager-0.10-no-Test::Requires.patch
rename to Package-DeprecationManager-0.12-no-Test::Requires.patch
index 94f2b4e..6eb79c5 100644
--- a/Package-DeprecationManager-0.10-no-Test::Requires.patch
+++ b/Package-DeprecationManager-0.12-no-Test::Requires.patch
@@ -1,8 +1,8 @@
---- Package-DeprecationManager-0.10/t/basic.t 2010-10-27 09:27:42.000000000 +0100
-+++ Package-DeprecationManager-0.10/t/basic.t 2010-10-27 09:28:07.699161151 +0100
+--- t/basic.t
++++ t/basic.t
@@ -4,9 +4,10 @@ use warnings;
- use Test::More;
use Test::Fatal;
+ use Test::More;
-use Test::Requires {
- 'Test::Output' => '0.16',
diff --git a/Package-DeprecationManager-0.12-old-Test::More.patch b/Package-DeprecationManager-0.12-old-Test::More.patch
new file mode 100644
index 0000000..a9ed10d
--- /dev/null
+++ b/Package-DeprecationManager-0.12-old-Test::More.patch
@@ -0,0 +1,60 @@
+--- t/basic.t
++++ t/basic.t
+@@ -2,12 +2,14 @@ use strict;
+ use warnings;
+
+ use Test::Fatal;
+-use Test::More 0.88;
++use Test::More;
+
+ use Test::Requires {
+ 'Test::Output' => '0.16',
+ };
+
++plan tests => 25;
++
+ {
+ like(
+ exception {
+@@ -218,5 +220,3 @@ use Test::Requires {
+ q{},
+ 'no deprecation warning for second call to My::Package1::foo()';
+ }
+-
+-done_testing();
+--- t/compile.t
++++ t/compile.t
+@@ -1,9 +1,7 @@
+ use strict;
+ use warnings;
+
+-use Test::More 0.88;
++use Test::More tests => 1;
+
+ eval "require Package::DeprecationManager";
+ ok( ! $@, 'no errors loading require Package::DeprecationManager' );
+-
+-done_testing();
+--- t/release-cpan-changes.t
++++ t/release-cpan-changes.t
+@@ -1,15 +1,11 @@
+ #!perl
+
++use Test::More;
++
+ BEGIN {
+- unless ($ENV{RELEASE_TESTING}) {
+- require Test::More;
+- Test::More::plan(skip_all => 'these tests are for release candidate testing');
+- }
++ plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING});
++ eval 'use Test::CPAN::Changes';
++ plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
+ }
+
+-
+-use Test::More;
+-eval 'use Test::CPAN::Changes';
+-plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
+ changes_ok();
+-done_testing();
diff --git a/Package-DeprecationManager-0.12-stopwords.patch b/Package-DeprecationManager-0.12-stopwords.patch
new file mode 100644
index 0000000..91c053a
--- /dev/null
+++ b/Package-DeprecationManager-0.12-stopwords.patch
@@ -0,0 +1,7 @@
+--- t/release-pod-spell.t
++++ t/release-pod-spell.t
+@@ -31,3 +31,4 @@
+ PayPal
+ Rolsky
+ api
++deprecations
diff --git a/perl-Package-DeprecationManager.spec b/perl-Package-DeprecationManager.spec
index cb7fe95..85b3b97 100644
--- a/perl-Package-DeprecationManager.spec
+++ b/perl-Package-DeprecationManager.spec
@@ -1,8 +1,5 @@
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%global old_eumm %(%{__perl} -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.30 ? 1 : 0;' 2>/dev/null || echo 0)
-
# We need to patch the test suite if we have an old version of Test::More
-%global old_test_more %(%{__perl} -MTest::More -e 'printf "%d\\n", $Test::More::VERSION < 0.88 ? 1 : 0;' 2>/dev/null || echo 0)
+%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
# Test::Kwalitee and Test::Requires not available in EPEL < 6
%global extra_tests_available %(expr 0%{?fedora} + 0%{?rhel} '>' 5)
@@ -11,23 +8,27 @@
%global cpan_changes_available %(expr 0%{?fedora} + 0%{?rhel} '>' 6)
Name: perl-Package-DeprecationManager
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
Summary: Manage deprecation warnings for your distribution
Group: Development/Libraries
License: Artistic 2.0
URL: http://search.cpan.org/dist/Package-DeprecationManager/
Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Package-DeprecationMa...
-Patch0: Package-DeprecationManager-0.11-old-EU::MM.patch
-Patch1: Package-DeprecationManager-0.11-old-Test::More.patch
-Patch2: Package-DeprecationManager-0.10-no-Test::Requires.patch
+Patch1: Package-DeprecationManager-0.12-old-Test::More.patch
+Patch2: Package-DeprecationManager-0.12-no-Test::Requires.patch
+Patch3: Package-DeprecationManager-0.12-stopwords.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
BuildRequires: perl(Carp)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(List::MoreUtils)
BuildRequires: perl(Params::Util)
+BuildRequires: perl(Pod::Coverage::TrustPod)
BuildRequires: perl(Sub::Install)
+%if %{cpan_changes_available}
+BuildRequires: perl(Test::CPAN::Changes)
+%endif
BuildRequires: perl(Test::EOL)
BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::More)
@@ -35,10 +36,7 @@ BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Output)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
-BuildRequires: perl(Pod::Coverage::TrustPod)
-%if %{cpan_changes_available}
-BuildRequires: perl(Test::CPAN::Changes)
-%endif
+BuildRequires: perl(Test::Spelling), aspell-en
%if %{extra_tests_available}
BuildRequires: perl(Test::Kwalitee)
BuildRequires: perl(Test::Requires)
@@ -55,21 +53,19 @@ the version when that feature was deprecated.
%prep
%setup -q -n Package-DeprecationManager-%{version}
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%if %{old_eumm}
-%patch0 -p1
-%endif
-
# Fix tests for Test::More prior to 0.88
%if %{old_test_more}
-%patch1 -p1
+%patch1
%endif
# If we don't have Test::Requires, we need to patch it out of the test suite
%if ! %{extra_tests_available}
-%patch2 -p1
+%patch2
%endif
+# "deprecations" not a common dictionary word
+%patch3
+
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
@@ -78,7 +74,6 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -94,6 +89,17 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::DeprecationManager.3pm*
%changelog
+* Mon Mar 5 2012 Paul Howarth <paul(a)city-fan.org> - 0.12-1
+- Update to 0.12:
+ - Fix tests to pass with Carp 1.25 (CPAN RT#75520)
+- BR: perl(Test::Spelling), aspell-en
+- Add patch to accept "deprecations" as a valid dictionary word
+- Update patches to apply cleanly
+- Don't need to remove empty directories from buildroot
+- Don't use macros for commands
+- Drop EPEL-4 support:
+ - Drop patch supporting build with ExtUtils::MakeMaker < 6.30
+
* Thu Jan 12 2012 Paul Howarth <paul(a)city-fan.org> - 0.11-3
- Fedora 17 mass rebuild
diff --git a/sources b/sources
index 5ce02d7..18b6b9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d09664839b730997c591a5c891a2972b Package-DeprecationManager-0.11.tar.gz
+5f7f21db151fa7f19c10cb6009a735d4 Package-DeprecationManager-0.12.tar.gz
12 years, 3 months