[perl-HTML-Mason] - Rebuild package (Was missing in rawhide). - Switch to using perl_default_filter. - Add explicit Re
corsepiu
corsepiu at fedoraproject.org
Thu Feb 3 15:30:56 UTC 2011
commit b4b3b0ec0f23dcf5748724f73e9c226843936dac
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Thu Feb 3 16:30:40 2011 +0100
- Rebuild package (Was missing in rawhide).
- Switch to using perl_default_filter.
- Add explicit Require:/Provides: config(perl-HTML-Mason) to work-around
https://bugzilla.redhat.com/show_bug.cgi?id=674765.
HTML-Mason-filter-provides.sh | 3 ---
HTML-Mason-filter-requires.sh | 3 ---
perl-HTML-Mason.spec | 29 +++++++++++++----------------
3 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/perl-HTML-Mason.spec b/perl-HTML-Mason.spec
index 318ee09..a0c26d7 100644
--- a/perl-HTML-Mason.spec
+++ b/perl-HTML-Mason.spec
@@ -1,6 +1,6 @@
Name: perl-HTML-Mason
Version: 1.45
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Powerful Perl-based web site development and delivery engine
License: GPL+ or Artistic
@@ -32,15 +32,12 @@ Requires: perl(HTML::Entities)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: %{_sysconfdir}/httpd/conf.d
-# Filter perl(MasonX::Request::PlusApacheSession).
-Source98: HTML-Mason-filter-requires.sh
-%global real_perl_requires %{__perl_requires}
-%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires
+# perl_filter_default breaks adding config(foo) handling
+# c.f. https://bugzilla.redhat.com/show_bug.cgi?id=674765
+Requires: config(perl-HTML-Mason) = %{epoch}:%{version}-%{release}
+Provides: config(perl-HTML-Mason) = %{epoch}:%{version}-%{release}
-# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
-Source99: HTML-Mason-filter-provides.sh
-%global real_perl_provides %{__perl_provides}
-%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+%{?perl_default_filter}
%description
Mason is a powerful Perl-based web site development and delivery
@@ -52,12 +49,6 @@ maintaining development and production sites, and more.
%prep
%setup -q -n HTML-Mason-%{version}
-sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires}
-chmod +x %{__perl_requires}
-
-sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
-chmod +x %{__perl_provides}
-
%build
%{__perl} Build.PL installdirs=vendor
./Build
@@ -86,7 +77,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason
#./Build test
%clean
-rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
@@ -100,6 +91,12 @@ rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
%dir %{_localstatedir}/www/mason
%changelog
+* Thu Feb 03 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 1:1.45-2
+- Rebuild package (Was missing in rawhide).
+- Switch to using perl_default_filter.
+- Add explicit Require:/Provides: config(perl-HTML-Mason) to work-around
+ https://bugzilla.redhat.com/show_bug.cgi?id=674765.
+
* Fri Dec 17 2010 Steven Pritchard <steve at kspei.com> 1:1.45-1
- Update to 1.45.
- Drop build.patch (now in the upstream release).
More information about the perl-devel
mailing list