rpms/perl-Catalyst-Runtime/devel perl-Catalyst-Runtime.spec, 1.6, 1.7

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11364

Modified Files:
	perl-Catalyst-Runtime.spec 
Log Message:
* Sat May 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-2
- pull catalyst.pl back from perl-Catalyst-Devel, put into subpackage: too
  much of a headache to keep this bit of -Runtime in -Devel
- pull in tests
- deal with perl-Catalyst-Manual issues
  
* Sat May 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-1
- update to 5.7014



Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Catalyst-Runtime.spec	31 May 2008 19:48:12 -0000	1.6
+++ perl-Catalyst-Runtime.spec	23 Jun 2008 03:36:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Runtime
 Version:        5.7014
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Catalyst core modules
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,17 @@
 This is the primary class for the Catalyst-Runtime distribution.  It provides
 the core of any runtime Catalyst instance.
 
+
+%package        scripts
+Summary:        Scripts for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    scripts
+The %{name}-scripts package contains scripts distributed with
+%{name} but generally used for developing Catalyst applications.
+
+
 %prep
 %setup -q -n Catalyst-Runtime-%{version}
 
@@ -63,6 +74,28 @@
 perldoc perlgpl      > COPYING.gpl
 perldoc perlartistic > COPYING.artistic
 
+find .  -type f -exec chmod -c -x {} +
+find t/ -type f -exec perl -pi -e 's|^#!perl|#!/usr/bin/perl|' {} +
+
+# make sure doc/tests don't generate provides
+cat << \EOF > %{name}-prov
+#!/bin/sh
+FOO=`perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'`
+echo %{__perl_provides} $FOO >&2
+if [ "$FOO" != "" ] ; then %{__perl_provides} $FOO ; fi
+EOF
+
+%define __perl_provides %{_builddir}/Catalyst-Runtime-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} `perl -p -e 's|%{buildroot}%{_docdir}/%{name}-%{version}\S+||'`
+EOF
+
+%define __perl_requires %{_builddir}/Catalyst-Runtime-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -77,9 +110,6 @@
 
 %{_fixperms} %{buildroot}/*
 
-# packaged better -- and conflicting with! -- in Catalyst-Manual
-rm %{buildroot}%{perl_vendorlib}/Catalyst/Manual.pm
-
 %check
 # note that some of the optional tests we're enabling here will be skipped
 # anyways, due to deps on Catalyst::Devel, etc.  We cannot depend on
@@ -96,20 +126,29 @@
 export TEST_STRESS=1 
 export TEST_THREADS=1 
 make test
+make clean
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc Changes COPYING*
+%doc Changes COPYING* t/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
-# we deliver this in perl-Catalyst-Devel (needs Catalyst::Helper)
-%exclude %{_bindir}/*
-%exclude %{_mandir}/man1/*
+
+%files scripts 
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
 
 %changelog
+* Sat May 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-2
+- pull catalyst.pl back from perl-Catalyst-Devel, put into subpackage: too
+  much of a headache to keep this bit of -Runtime in -Devel
+- pull in tests
+- deal with perl-Catalyst-Manual issues
+  
 * Sat May 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-1
 - update to 5.7014