[LON-CAPA-cvs] cvs: modules /matthew/fedora_install mod_perl-1.26-5.spec

[matthew]

matthew		Mon Nov 24 10:41:12 2003 EDT

  Modified files:              
    /modules/matthew/fedora_install	mod_perl-1.26-5.spec 
  Log:
  Seems to work.  The previous one did not work and the lines which were
  commented out should have indicated something was horribly awry.  The
  fix implemented is to specify the installation directory to Makefile.PL.
  
  
Index: modules/matthew/fedora_install/mod_perl-1.26-5.spec
diff -u modules/matthew/fedora_install/mod_perl-1.26-5.spec:1.1 modules/matthew/fedora_install/mod_perl-1.26-5.spec:1.2
--- modules/matthew/fedora_install/mod_perl-1.26-5.spec:1.1	Wed Nov 19 11:48:04 2003
+++ modules/matthew/fedora_install/mod_perl-1.26-5.spec	Mon Nov 24 10:41:12 2003
@@ -34,7 +34,7 @@
 # Compile the module.
 perl Makefile.PL \
 	USE_APXS=1 WITH_APXS=%{_sbindir}/apxs PERL_USELARGEFILES=0 \
-	EVERYTHING=1 CCFLAGS="$RPM_OPT_FLAGS -fPIC"
+	EVERYTHING=1 CCFLAGS="$RPM_OPT_FLAGS -fPIC" DESTDIR=%{_tmppath}/%{name}-root
 make
 
 # Run the test suite.
@@ -58,10 +58,8 @@
 install -m644 faq/*.html $RPM_BUILD_ROOT%{contentdir}/html/manual/mod/mod_perl/
 
 # Remove the temporary files.
-# There were no temp files found and this generated an error, which caused 
-# the rpm build to fail.
-#find $RPM_BUILD_ROOT%{_libdir}/perl?/vendor_perl/*/*/auto -name "*.bs" | xargs rm
-#rm   $RPM_BUILD_ROOT%{_ibdir}/perl?/vendor_perl/*/*/auto/%{name}/.packlist
+find $RPM_BUILD_ROOT%{_libdir}/perl?/vendor_perl/*/*/auto -name "*.bs" | xargs rm
+rm   $RPM_BUILD_ROOT%{_libdir}/perl?/vendor_perl/*/*/auto/%{name}/.packlist
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -74,12 +72,12 @@
 %doc ToDo apache-modlist.html
 %{contentdir}/html/manual/mod/*
 %{_libdir}/apache/libperl.so
-#%{_libdir}/perl?/vendor_perl/*/*/auto/*
-#%{_libdir}/perl?/vendor_perl/*/*/Apache*
-#%{_libdir}/perl?/vendor_perl/*/*/Bundle/*
-#%{_libdir}/perl?/vendor_perl/*/*/cgi*
-#%{_libdir}/perl?/vendor_perl/*/*/mod_perl*
-#%{_mandir}/man3/*.3*
+%{_libdir}/perl?/vendor_perl/*/*/auto/*
+%{_libdir}/perl?/vendor_perl/*/*/Apache*
+%{_libdir}/perl?/vendor_perl/*/*/Bundle/*
+%{_libdir}/perl?/vendor_perl/*/*/cgi*
+%{_libdir}/perl?/vendor_perl/*/*/mod_perl*
+%{_mandir}/man3/*.3*
 
 %changelog
 * Wed Mar 27 2002 Chip Turner <cturner@redhat.com>