Author: steve
Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26969
Modified Files:
.cvsignore perl-HTML-Mason.spec sources
Log Message:
Update to 1.33.
Switch to Module::Build-based build.
Add various bindir mason scripts.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 11 Jan 2006 01:00:28 -0000 1.3
+++ .cvsignore 31 May 2006 22:15:39 -0000 1.4
@@ -1 +1 @@
-HTML-Mason-1.32.tar.gz
+HTML-Mason-1.33.tar.gz
Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Mason.spec 19 Jan 2006 18:28:12 -0000 1.4
+++ perl-HTML-Mason.spec 31 May 2006 22:15:39 -0000 1.5
@@ -1,6 +1,6 @@
Name: perl-HTML-Mason
-Version: 1.32
-Release: 2%{?dist}
+Version: 1.33
+Release: 1%{?dist}
Epoch: 1
Summary: Powerful Perl-based web site development and delivery engine
License: GPL or Artistic
@@ -22,8 +22,8 @@
BuildRequires: perl(Cache::Cache) >= 1
BuildRequires: perl(Class::Container) >= 0.07
BuildRequires: perl(Exception::Class) >= 1.15
-BuildRequires: perl(Module::Build::Compat) >= 0.02
BuildRequires: perl(Params::Validate) >= 0.7
+BuildRequires: perl(Module::Build)
BuildRequires: perl(mod_perl2)
Requires: perl(Cache::Cache) >= 1
Requires: perl(Class::Container) >= 0.07
@@ -44,20 +44,23 @@
%setup -q -n HTML-Mason-%{version}
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Build.PL installdirs=vendor
+./Build
%install
rm -rf $RPM_BUILD_ROOT
-# make: *** No rule to make target `pure_install'. Stop.
-make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+rm -f $RPM_BUILD_ROOT%{_bindir}/*.README
+for file in $RPM_BUILD_ROOT%{_bindir}/convert*.pl ; do
+ mv -f $file $( echo $file | sed 's,/\(convert.*\)\.pl$,/mason_\1,' )
+done
+mv -f $RPM_BUILD_ROOT%{_bindir}/mason.pl $RPM_BUILD_ROOT%{_bindir}/mason
+
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
@@ -65,7 +68,7 @@
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/mason
%check
-make test
+./Build test
%clean
rm -rf $RPM_BUILD_ROOT
@@ -74,6 +77,7 @@
%defattr(-,root,root,-)
%doc CREDITS Changes LICENSE README UPGRADE
%doc htdocs/ eg/ samples/
+%{_bindir}/mason*
%{perl_vendorlib}/*
%{_mandir}/man3/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/perl-HTML-Mason.conf
@@ -81,6 +85,11 @@
%dir %{_localstatedir}/www/mason
%changelog
+* Mon May 29 2006 Steven Pritchard <steve(a)kspei.com> 1:1.33-1
+- Update to 1.33
+- Switch to Module::Build-based build
+- Add various bindir mason scripts
+
* Thu Jan 19 2006 Steven Pritchard <steve(a)kspei.com> 1:1.32-2
- Epoch bump to resolve rpm thinking 1.3101 > 1.32
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Jan 2006 01:00:28 -0000 1.3
+++ sources 31 May 2006 22:15:39 -0000 1.4
@@ -1 +1 @@
-b0abfdd869d828a0ebbf2f64cfb9d094 HTML-Mason-1.32.tar.gz
+22c2cd76ed068630708175d570f97277 HTML-Mason-1.33.tar.gz