[perl-Pugs-Compiler-Rule] fix filter for RPM4.9, clean spec
Marcela Mašláňová
mmaslano at fedoraproject.org
Tue Feb 15 17:10:16 UTC 2011
commit ac843b9fb7e72417f12b6482ef9e96f363b05d7f
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date: Tue Feb 15 18:09:36 2011 +0100
fix filter for RPM4.9, clean spec
perl-Pugs-Compiler-Rule.spec | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/perl-Pugs-Compiler-Rule.spec b/perl-Pugs-Compiler-Rule.spec
index ad94cd1..838af74 100644
--- a/perl-Pugs-Compiler-Rule.spec
+++ b/perl-Pugs-Compiler-Rule.spec
@@ -1,12 +1,11 @@
Name: perl-Pugs-Compiler-Rule
Version: 0.37
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Compiler for Perl 6 regexes
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Pugs-Compiler-Rule/
Source0: http://www.cpan.org/authors/id/F/FG/FGLOCK/Pugs-Compiler-Rule-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(Cache::Cache) >= 1.05
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -20,9 +19,11 @@ Requires: perl(PadWalker) >= 1.0
Requires: perl(YAML::Syck) >= 0.60
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Source98: Pugs-Compiler-Rule-filter-requires.sh
-%global real_perl_requires %{__perl_requires}
-%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+
+%{?filter_setup:
+%filter_from_requires /perl(v6-alpha)/d
+%{?perl_default_filter}
+}
%description
This module provides an pure Perl 5 implementation for Perl 6 regexes,
@@ -31,9 +32,6 @@ which does not depend on the Haskell Pugs.
%prep
%setup -q -n Pugs-Compiler-Rule-%{version}
-sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
-chmod +x %{__perl_requires}
-
# Drop broken Pugs::Emitter::Rule::Parsec.
rm -f lib/Pugs/Emitter/Rule/Parsec.pm t/11-parsec.t
sed -i -e '\,^\(lib/Pugs/Emitter/Rule/Parsec.pm\|t/11-parsec.t\)$,d' MANIFEST
@@ -43,8 +41,6 @@ sed -i -e '\,^\(lib/Pugs/Emitter/Rule/Parsec.pm\|t/11-parsec.t\)$,d' MANIFEST
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 {} \;
@@ -58,9 +54,6 @@ make test \
&& mv -f t/ast/00-basic.t{_,} \
&& make test
-%clean
-rm -rf $RPM_BUILD_ROOT %{__perl_requires}
-
%files
%defattr(-,root,root,-)
%doc Changes README TODO
@@ -70,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires}
%{_mandir}/man3/*
%changelog
+* Tue Feb 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.37-9
+- fix filter for RPM4.9, clean spec
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the perl-devel
mailing list