rpms/perl-HTML-Mason/devel HTML-Mason-filter-provides.sh, NONE, 1.1 HTML-Mason-filter-requires.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 perl-HTML-Mason.spec, 1.7, 1.8 sources, 1.4, 1.5 filter-provides.sh, 1.1, NONE filter-requires.sh, 1.1, NONE
Steven Pritchard (steve)
fedora-extras-commits at redhat.com
Tue Oct 17 00:58:58 UTC 2006
Author: steve
Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10786
Modified Files:
.cvsignore perl-HTML-Mason.spec sources
Added Files:
HTML-Mason-filter-provides.sh HTML-Mason-filter-requires.sh
Removed Files:
filter-provides.sh filter-requires.sh
Log Message:
Update to 1.34.
Use fixperms macro instead of our own chmod incantation.
Reformat a bit to more closely resemble current cpanspec output.
Rename filter-*.sh to HTML-Mason-filter-*.sh.
--- NEW FILE HTML-Mason-filter-provides.sh ---
#!/bin/sh
@@PERL_PROV@@ "$@" | sed -e '/^perl(MyApp::/d'
--- NEW FILE HTML-Mason-filter-requires.sh ---
#!/bin/sh
@@PERL_REQ@@ "$@" | sed -e '/^perl(MasonX::Request::PlusApacheSession)$/d'
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 31 May 2006 22:15:39 -0000 1.4
+++ .cvsignore 17 Oct 2006 00:58:27 -0000 1.5
@@ -1 +1 @@
-HTML-Mason-1.33.tar.gz
+HTML-Mason-1.34.tar.gz
Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-HTML-Mason.spec 17 Sep 2006 19:13:54 -0000 1.7
+++ perl-HTML-Mason.spec 17 Oct 2006 00:58:27 -0000 1.8
@@ -1,6 +1,6 @@
Name: perl-HTML-Mason
-Version: 1.33
-Release: 3%{?dist}
+Version: 1.34
+Release: 1%{?dist}
Epoch: 1
Summary: Powerful Perl-based web site development and delivery engine
License: GPL or Artistic
@@ -9,21 +9,13 @@
Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-%{version}.tar.gz
Source1: perl-HTML-Mason.conf
-# Filter perl(MasonX::Request::PlusApacheSession).
-Source2: filter-requires.sh
-%define __perl_requires %{SOURCE2}
-
-# Filter perl(MyApp::Mason) and perl(MyApp::MasonPlusSession).
-Source3: filter-provides.sh
-%define __perl_provides %{SOURCE3}
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(Cache::Cache) >= 1
BuildRequires: perl(Class::Container) >= 0.07
BuildRequires: perl(Exception::Class) >= 1.15
-BuildRequires: perl(Params::Validate) >= 0.7
BuildRequires: perl(Module::Build)
+BuildRequires: perl(Params::Validate) >= 0.7
BuildRequires: perl(mod_perl2)
BuildRequires: perl(HTML::Entities)
Requires: perl(Cache::Cache) >= 1
@@ -35,6 +27,16 @@
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
+
+# 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
+
%description
Mason is a powerful Perl-based web site development and delivery
engine. With Mason you can embed Perl code in your HTML and construct
@@ -45,6 +47,12 @@
%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
@@ -55,7 +63,7 @@
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
rm -f $RPM_BUILD_ROOT%{_bindir}/*.README
for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do
@@ -73,11 +81,11 @@
./Build test
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT %{__perl_requires} %{__perl_provides}
%files
%defattr(-,root,root,-)
-%doc CREDITS Changes LICENSE README UPGRADE
+%doc Changes CREDITS LICENSE README UPGRADE
%doc htdocs/ eg/ samples/
%{_bindir}/mason*
%{perl_vendorlib}/*
@@ -87,7 +95,13 @@
%dir %{_localstatedir}/www/mason
%changelog
-* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1.33-3
+* Mon Oct 16 2006 Steven Pritchard <steve at kspei.com> 1:1.34-1
+- Update to 1.34.
+- Use fixperms macro instead of our own chmod incantation.
+- Reformat a bit to more closely resemble current cpanspec output.
+- Rename filter-*.sh to HTML-Mason-filter-*.sh.
+
+* Sat Sep 16 2006 Steven Pritchard <steve at kspei.com> 1:1.33-3
- Fix find option order.
* Thu Jun 08 2006 Steven Pritchard <steve at kspei.com> 1:1.33-2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 31 May 2006 22:15:39 -0000 1.4
+++ sources 17 Oct 2006 00:58:27 -0000 1.5
@@ -1 +1 @@
-22c2cd76ed068630708175d570f97277 HTML-Mason-1.33.tar.gz
+a41b0fc3890f07a1b701950537f7543e HTML-Mason-1.34.tar.gz
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---
More information about the scm-commits
mailing list