[perl-Parse-RecDescent/el4] Filter out bogus provide of perl(main)
Paul Howarth
pghmcfc at fedoraproject.org
Tue Sep 20 13:56:52 UTC 2011
commit 0882b6d6823c4a09babcf7d99d1f800fc7649edf
Author: Paul Howarth <paul at city-fan.org>
Date: Tue Sep 20 13:40:35 2011 +0100
Filter out bogus provide of perl(main)
- Filter out bogus provide of perl(main)
- BR: perl(Carp)
- BR: perl(ExtUtils::MakeMaker)
- BR: perl(Text::Balanced)
- Spec file clean-up
.gitignore | 2 +-
perl-Parse-RecDescent.spec | 120 ++++++++++++++++++++++----------------------
2 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2c8a05..f53ff7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Parse-RecDescent-1.94.tar.gz
+/Parse-RecDescent-[0-9.]*.tar.gz
diff --git a/perl-Parse-RecDescent.spec b/perl-Parse-RecDescent.spec
index 1283e19..ca45db6 100644
--- a/perl-Parse-RecDescent.spec
+++ b/perl-Parse-RecDescent.spec
@@ -1,84 +1,85 @@
-Name: perl-Parse-RecDescent
-Version: 1.94
-Release: 6%{?dist}
-Summary: Parse-RecDescent Perl module
-
-Group: Development/Libraries
-License: Artistic
-URL: http://search.cpan.org/dist/Parse-RecDescent/
-Source0: http://www.cpan.org/authors/id/D/DC/DCONWAY/Parse-RecDescent-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-BuildRequires: perl >= 1:5.6.1
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name: perl-Parse-RecDescent
+Version: 1.94
+Release: 7%{?dist}
+Summary: Generate Recursive-Descent Parsers
+Group: Development/Libraries
+License: 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(Text::Balanced)
+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.
-
+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
%prep
-%setup -q -n Parse-RecDescent-%{version}
+%setup -q -n Parse-RecDescent-%{version}
+chmod -c a-x Changes README lib/Parse/* demo/* tutorial/*
+perl -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!/usr/bin/perl|' demo/*
-chmod 644 Changes README lib/Parse/* demo/* tutorial/*
-%{__perl} -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!%{__perl}|' demo/*
+# Filter out bogus provide of perl(main)
+%global provfilt /bin/sh -c "%{__perl_provides} | grep -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
%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
-* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.94-6.el4
-- build for EL4.
-- Fix minor specfile issues
-- Package the docs as well
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.94-5.2.1
+* Tue Sep 20 2011 Paul Howarth <paul at city-fan.org> 1.94-7
+- filter out bogus provide of perl(main)
+- BR: perl(Carp)
+- BR: perl(ExtUtils::MakeMaker)
+- BR: perl(Text::Balanced)
+- spec file clean-up
+
+* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> 1.94-6.el4
+- build for EL4
+- 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
+* 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>
@@ -87,9 +88,9 @@ rm -rf $RPM_BUILD_ROOT
* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt for new gcj
-* 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
@@ -110,5 +111,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