[prev in list] [next in list] [prev in thread] [next in thread] 

List:       opensuse-commit
Subject:    commit apache2-mod_perl for openSUSE:Factory
From:       root () hilbert ! suse ! de (h_root)
Date:       2010-11-30 23:13:41
Message-ID: 20101130231341.EE28E2021C () hilbert ! suse ! de
[Download RAW message or body]


Hello community,

here is the log from the commit of package apache2-mod_perl for openSUSE:Factory
checked in at Wed Dec 1 00:13:41 CET 2010.



--------
--- apache2-mod_perl/apache2-mod_perl.changes	2010-03-05 13:02:49.000000000 +0100
+++ apache2-mod_perl/apache2-mod_perl.changes	2010-11-25 19:11:27.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Nov 25 18:09:09 UTC 2010 - chris@computersalat.de
+
+- fix perl_process_packlist stuff
+  o remove .packlist, perllocal.pod files
+- cleanupo spec
+  o replace 'mkdir -p' with 'install -d' or 'install -D'
+  o macros
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apache2-mod_perl.spec ++++++
--- /var/tmp/diff_new_pack.4YVutG/_old	2010-11-30 18:44:24.000000000 +0100
+++ /var/tmp/diff_new_pack.4YVutG/_new	2010-11-30 18:44:24.000000000 +0100
@@ -43,7 +43,7 @@
 Conflicts:      mod_perl
 AutoReqProv:    on
 Version:        2.0.4
-Release:        41
+Release:        48
 Source0:        mod_perl-%{version}.tar.bz2
 Patch:          %{name}-%{version}-tests.diff
 #%define apache_test_version 1_99_15
@@ -111,7 +111,7 @@
 find -name ".svn" -type d | xargs rm -rfv
 
 %build
-perl Makefile.PL MP_APXS=`which %{apxs}` MP_CCOPTS="$(%{apxs} -q CFLAGS)"
+perl Makefile.PL INSTALLDIRS=vendor MP_APXS=`which %{apxs}` MP_CCOPTS="$(%{apxs} -q CFLAGS)"
 ln -s Apache-mod_perl_guide-1.29/bin bin
 make
 # XXX mod_include/SSI does not include files when they are not named .shtml
@@ -167,14 +167,31 @@
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
-mkdir -p $RPM_BUILD_ROOT/%{apache_libexecdir}
-cp -p src/modules/perl/mod_perl.so $RPM_BUILD_ROOT/%{apache_libexecdir}
-mkdir -p $RPM_BUILD_ROOT/%{apache_includedir}/modules/perl
-cp src/modules/perl/*.h $RPM_BUILD_ROOT/%{apache_includedir}/modules/perl/
+%perl_make_install
+### since 11.4 perl_process_packlist
+### removes .packlist, perllocal.pod files
+%if 0%{?suse_version} > 1130
 %perl_process_packlist
-mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
+%else
+# do not perl_process_packlist
+# remove .packlist file
+find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ;
+# remove perllocal.pod file
+%{__rm} -f $RPM_BUILD_ROOT%perl_archlib/perllocal.pod
+%endif
+
+#mkdir -p $RPM_BUILD_ROOT/%{apache_libexecdir}
+#cp -p src/modules/perl/mod_perl.so $RPM_BUILD_ROOT/%{apache_libexecdir}
+%{__install} -D src/modules/perl/mod_perl.so \
+ $RPM_BUILD_ROOT/%{apache_libexecdir}/mod_perl.so
+
+#mkdir -p $RPM_BUILD_ROOT/%{apache_includedir}/modules/perl
+%{__install} -d $RPM_BUILD_ROOT/%{apache_includedir}/modules/perl
+%{__cp} src/modules/perl/*.h $RPM_BUILD_ROOT/%{apache_includedir}/modules/perl/
+
+#mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
+%{__install} -d $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d
+
 cat > $RPM_BUILD_ROOT/%{apache_sysconfdir}/mod_perl-startup.pl <<-EOF
   # Taken from http://perl.apache.org/docs/2.0/user/handlers/server.html#Startup_File
   if ( ! \$ENV{MOD_PERL}) { die "GATEWAY_INTERFACE not Perl!"; }
@@ -198,7 +215,10 @@
   use APR::Const -compile => ':common';
   1;
 EOF
-mkdir -p $RPM_BUILD_ROOT/%{apache_serverroot}/perl-lib
+
+#mkdir -p $RPM_BUILD_ROOT/%{apache_serverroot}/perl-lib
+%{__install} -d $RPM_BUILD_ROOT/%{apache_serverroot}/perl-lib
+
 cat > $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/mod_perl.conf <<EOF
 <Directory "%{apache_serverroot}/perl-lib">
     AllowOverride None
@@ -229,12 +249,10 @@
 # vim: ft=apache
 EOF
 # install documentation files alongside perl modules, where applicable
-cp -av docs/api/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/
-cp -av docs/api/APR/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/APR/
-cp -av docs/api/Apache2/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/Apache2/
-cp -av docs/api/ModPerl/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/ModPerl/
-# remove unwanted files
-find $RPM_BUILD_ROOT/%{perl_sitearch} -name .packlist | xargs --no-run-if-empty rm -v
+%{__cp} -av docs/api/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/
+%{__cp} -av docs/api/APR/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/APR/
+%{__cp} -av docs/api/Apache2/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/Apache2/
+%{__cp} -av docs/api/ModPerl/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/ModPerl/
 
 %files
 %defattr(-,root,root)
@@ -242,7 +260,6 @@
 %doc docs
 %dir %{apache_libexecdir}
 %{apache_libexecdir}/mod_perl.so
-/var/adm/perl-modules/%{name}
 %config(noreplace) %{apache_sysconfdir}/mod_perl-startup.pl
 %config(noreplace) %{apache_sysconfdir}/conf.d/mod_perl.conf
 %dir %{apache_serverroot}/perl-lib


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

[prev in list] [next in list] [prev in thread] [next in thread]