[perl-parent] Spec clean-up

Paul Howarth pghmcfc at fedoraproject.org
Tue Feb 7 19:53:42 UTC 2012


commit 0bba3e15d798b38d316d36537366d23051ff3335
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Feb 7 19:53:05 2012 +0000

    Spec clean-up
    
    - Reinstate compatibility with old distributions like EL-5
      - Add back buildroot definition and cleaning
    - Use DESTDIR rather than PERL_INSTALL_ROOT
    - Make %files list more explicit
    - Drop redundant %{?perl_default_filter}
    - Don't use macros for commands
    - Use tabs

 .gitignore       |    4 +-
 perl-parent.spec |  117 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 64 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2745434..d658b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-parent-0.223.tar.gz
-/parent-0.224.tar.gz
-/parent-0.225.tar.gz
+/parent-[0-9.]*.tar.gz
diff --git a/perl-parent.spec b/perl-parent.spec
index b72420b..97c51cb 100644
--- a/perl-parent.spec
+++ b/perl-parent.spec
@@ -1,67 +1,76 @@
-Name:           perl-parent
-Epoch:          1
-Version:        0.225
-Release:        5%{?dist}
-Summary:        Establish an ISA relationship with base classes at compile time
-License:        GPL+ or Artistic
-Group:          Development/Libraries
-URL:            http://search.cpan.org/dist/parent/
-Source0:        http://search.cpan.org/CPAN/authors/id/C/CO/CORION/parent-%{version}.tar.gz
-BuildArch:      noarch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More) >= 0.4
-
-%{?perl_default_filter}
+Name:		perl-parent
+Epoch:		1
+Version:	0.225
+Release:	6%{?dist}
+Summary:	Establish an ISA relationship with base classes at compile time
+License:	GPL+ or Artistic
+Group:		Development/Libraries
+URL:		http://search.cpan.org/dist/parent/
+Source0:	http://search.cpan.org/CPAN/authors/id/C/CO/CORION/parent-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch:	noarch
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Test::More) >= 0.4
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Allows you to both load one or more modules, while setting up inheritance
 from those modules at the same time. Mostly similar in effect to:
 
-    package Baz;
+	package Baz;
 
-    BEGIN {
-        require Foo;
-        require Bar;
+	BEGIN {
+		require Foo;
+		require Bar;
 
-        push @ISA, qw(Foo Bar);
-    }
+		push @ISA, qw(Foo Bar);
+	}
 
 %prep
 %setup -q -n parent-%{version}
 
-find . -type f -exec chmod -c -x {} +
-
-# sed -e '/perl([DFR].*)/d'
+# Remove spurious exec permissions
+chmod -c -x Changes lib/parent.pm
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-
+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}/*
+find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
+%clean
+rm -rf %{buildroot}
+
 %files
-%doc Changes t/
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%defattr(-,root,root,-)
+%doc Changes
+%{perl_vendorlib}/parent.pm
+%{_mandir}/man3/parent.3pm*
 
 %changelog
+* Tue Feb  7 2012 Paul Howarth <paul at city-fan.org> - 1:0.225-6
+- Reinstate compatibility with old distributions like EL-5
+  - Add back buildroot definition and cleaning
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Make %%files list more explicit
+- Drop redundant %%{?perl_default_filter}
+- Don't use macros for commands
+- Use tabs
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.225-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Wed Aug 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:0.225-4
-- change path on vendor, so our debuginfo are not conflicting with
- perl core debuginfos
+- Install to vendor directories rather than perl core directories so as to
+  avoid conflicts between our debuginfo and the main perl-debuginfo package
 
 * Mon Jun 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:0.225-3
 - Perl mass rebuild
@@ -69,31 +78,31 @@ make test
 * Tue Jun 14 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:0.225-2
 - Perl mass rebuild
 
-* Sat May 07 2011 Iain Arnell <iarnell at gmail.com> 1:0.225-1
-- update to latest upstream version
-- clean up spec for modern rpmbuild
+* Sat May 07 2011 Iain Arnell <iarnell at gmail.com> - 1:0.225-1
+- Update to latest upstream version
+- Clean up spec for modern rpmbuild
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.224-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sun Nov 21 2010 Iain Arnell <iarnell at gmail.com> 0.224-1
-- update to latest upstream version
+* Sun Nov 21 2010 Iain Arnell <iarnell at gmail.com> - 1:0.224-1
+- Update to latest upstream version
 
 * Tue May 04 2010 Marcela Maslanova <mmaslano at redhat.com> - 1:0.223-4
 - Mass rebuild with perl-5.12.0
 
-* Sat Mar 27 2010 Iain Arnell <iarnell at gmail.com> 1:0.223-3
-- dual-life module
-- add epoch to match that of parent in core
-- use core macros, not vendor
+* Sat Mar 27 2010 Iain Arnell <iarnell at gmail.com> - 1:0.223-3
+- Dual-life module
+- Add epoch to match that of parent in core
+- Use core macros, not vendor
 
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.223-2
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
 
-* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.223-1
-- update filtering
-- auto-update to 0.223 (by cpan-spec-update 0.01)
-- altered br on perl(Test::More) (0 => 0.4)
+* Fri Sep 11 2009 Chris Weyl <cweyl at alumni.drew.edu> - 0.223-1
+- Update filtering
+- Auto-update to 0.223 (by cpan-spec-update 0.01)
+- Altered br on perl(Test::More) (0 => 0.4)
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.221-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -101,8 +110,8 @@ make test
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.221-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Jun 19 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.221-2
-- bump
+* Thu Jun 19 2008 Chris Weyl <cweyl at alumni.drew.edu> - 0.221-2
+- Bump
 
-* Wed May 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.221-1
-- Specfile autogenerated by cpanspec 1.75.
+* Wed May 28 2008 Chris Weyl <cweyl at alumni.drew.edu> - 0.221-1
+- Specfile autogenerated by cpanspec 1.75


More information about the scm-commits mailing list