[perl-Parse-RecDescent/el6: 6/7] Spec file clean-up

Paul Howarth pghmcfc at fedoraproject.org
Tue Sep 20 13:47:52 UTC 2011


commit da7427691fee3de2391e0f1ccbd73872a70f9c02
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 20 14:19:36 2011 +0100

    Spec file clean-up
    
    - BR: perl(Carp)
    - Spec file clean-up
    - Remove redundant filtering
    - Fix perl interpreter locations in demo scripts
    - Re-code upstream Changes file as UTF-8

 perl-Parse-RecDescent.spec |  163 ++++++++++++++++++-------------------------
 1 files changed, 68 insertions(+), 95 deletions(-)
---
diff --git a/perl-Parse-RecDescent.spec b/perl-Parse-RecDescent.spec
index 10fe0d4..997130a 100644
--- a/perl-Parse-RecDescent.spec
+++ b/perl-Parse-RecDescent.spec
@@ -1,139 +1,112 @@
-Name:           perl-Parse-RecDescent
-Version:        1.962.2
-Release:        1%{?dist}
-Summary:        Parse-RecDescent Perl module
-
-Group:          Development/Libraries
-License:        GPL+ or Artistic
-URL:            http://search.cpan.org/dist/Parse-RecDescent/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-%{version}.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker), perl(version), perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Text::Balanced)
-
-%{?perl_default_filter}
+Name:		perl-Parse-RecDescent
+Version:	1.962.2
+Release:	2%{?dist}
+Summary:	Generate Recursive-Descent Parsers
+Group:		Development/Libraries
+License:	GPL+ or Artistic
+URL:		http://search.cpan.org/dist/Parse-RecDescent/
+Source0:	http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildArch:	noarch
+BuildRequires:	perl(Carp)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::Pod)
+BuildRequires:	perl(Text::Balanced)
+BuildRequires:	perl(version)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Parse::RecDescent incrementally generates top-down recursive-descent
 text parsers from simple yacc-like grammar specifications. It
 provides:
-    * Regular expressions or literal strings as terminals (tokens),
-    * Multiple (non-contiguous) productions for any rule,
-    * Repeated and optional subrules within productions,
-    * Full access to Perl within actions specified as part of the
-      grammar,
-    * Simple automated error reporting during parser generation and
-      parsing,
-    * The ability to commit to, uncommit to, or reject particular
-      productions during a parse,
-    * The ability to pass data up and down the parse tree ("down" via
-      subrule argument lists, "up" via subrule return values)
-    * Incremental extension of the parsing grammar (even during a
-      parse),
-    * Precompilation of parser objects,
-
-User-definable reduce-reduce conflict resolution via "scoring" of
-matching productions.
-
+ * Regular expressions or literal strings as terminals (tokens)
+ * Multiple (non-contiguous) productions for any rule
+ * Repeated and optional subrules within productions
+ * Full access to Perl within actions specified as part of the grammar
+ * Simple automated error reporting during parser generation and parsing
+ * The ability to commit to, uncommit to, or reject particular
+   productions during a parse
+ * The ability to pass data up and down the parse tree ("down" via
+   subrule argument lists, "up" via subrule return values)
+ * Incremental extension of the parsing grammar (even during a parse)
+ * Precompilation of parser objects
+ * User-definable reduce-reduce conflict resolution via "scoring" of
+   matching productions
 
 %prep
 %setup -q -n Parse-RecDescent-%{version}
-chmod a-x demo/* tutorial/*
-%{__perl} -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!%{__perl}|' demo/*
-for f in demo/demo_dot.pl; do
-  iconv -f iso-8859-1 -t utf-8 < "$f" > "${f}_" && mv -f "${f}_" "$f"
+chmod -c a-x demo/* tutorial/*
+perl -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!/usr/bin/perl|' demo/*
+perl -pi -e 's|^#!\s?/opt/local/bin/perl5\.10\.0\b|#!/usr/bin/perl|' demo/*
+for f in Changes demo/demo_dot.pl; do
+	iconv -f iso-8859-1 -t utf-8 < ${f} > ${f}_ && mv -f ${f}_ ${f}
 done
 
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Parse/
-%{_mandir}/man3/*.3*
 %doc Changes README demo/ tutorial/
-
+%{perl_vendorlib}/Parse/
+%{_mandir}/man3/Parse::RecDescent.3pm*
 
 %changelog
+* Tue Sep 20 2011 Paul Howarth <paul at city-fan.org> 1.962.2-2
+- BR: perl(Carp)
+- spec file clean-up
+- remove redundant filtering
+- fix perl interpreter locations in demo scripts
+- re-code upstream Changes file as UTF-8
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.962.2-1
 - updated for latest GA SQL::Translator
 - add default filtering
 - auto-update to 1.962.2 (by cpan-spec-update 0.01)
 - added a new br on perl(Text::Balanced) (version 0)
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.96-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.96-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Feb  2 2009 Stepan Kasal <skasal at redhat.com> - 1.96-1
+* Mon Feb  2 2009 Stepan Kasal <skasal at redhat.com> 1.96-1
 - new upstream version
 
-* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.95.1-5
-- Rebuild for perl 5.10 (again)
-
-* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.95.1-4
-- rebuild for new perl
-
-* Wed Nov 14 2007 Robin Norwood <rnorwood at redhat.com> - 1.95.1-3
-- Apply fixes from package review:
-  - Remove BR: perl
-  - Use iconv to convert file to utf-8
-  - Include BR: perl(Test::Pod)
-  - Fix old changelog entry
-- Resolves: bz#226274
+* Wed Nov 14 2007 Robin Norwood <rnorwood at redhat.com> 1.95.1-3
+- apply fixes from package review:
+  - remove BR: perl
+  - use iconv to convert file to utf-8
+  - include BR: perl(Test::Pod)
+  - fix old changelog entry
+- resolves: bz#226274
 
-* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.95.1-2
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.95.1-2
 - add BR: perl(version), perl(Test::More)
 
-* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.95.1-1
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.95.1-1
 - bump to 1.95.1
 - correct license tag (now under perl license)
 - add BR: perl(ExtUtils::MakeMaker)
 
-* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.94-6.fc8
-- Bring fixes from EPEL build into F8
-- Fix minor specfile issues
-- Package the docs as well
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.94-5.2.1
-- rebuild
-
-* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.94-5.2
-- rebuild for new perl-5.8.8
-
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcc
-
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
+* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> 1.94-6.fc8
+- bring fixes from EPEL build into F8
+- fix minor specfile issues
+- package the docs as well
 
-* Thu Apr 21 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.94-5
+* Thu Apr 21 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> 1.94-5
 - #155620
-- Bring up to date with current Fedora.Extras perl spec template.
+- bring up to date with current Fedora Extras perl spec template
 
 * Wed Sep 22 2004 Chip Turner <cturner at redhat.com> 1.94-4
 - rebuild
@@ -154,4 +127,4 @@ rm -rf $RPM_BUILD_ROOT
 - description update
 
 * Fri Jun 07 2002 cturner at redhat.com
-- Specfile autogenerated
+- specfile autogenerated


More information about the scm-commits mailing list