SPECS: apache.spec - add libtool patch - make %build re-entrant, c...

[glen]

Author: glen                         Date: Mon Dec 12 02:33:41 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add libtool patch
- make %build re-entrant, cleanups (some hacks no longer needed)
- package some missing files

---- Files affected:
SPECS:
   apache.spec (1.423 -> 1.424) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.423 SPECS/apache.spec:1.424
--- SPECS/apache.spec:1.423	Mon Dec 12 00:08:40 2005
+++ SPECS/apache.spec	Mon Dec 12 03:33:35 2005
@@ -191,9 +191,6 @@
 #  /usr/lib64/apache/mod_imagemap.so
 #  /usr/lib64/apache/mod_logio.so
 #  /usr/lib64/apache/mod_version.so
-#  /usr/sbin/htcacheclean
-#  /usr/sbin/httxt2dbm
-#  /usr/share/man/man8/htcacheclean.8.gz
 
 #
 # Conditional build:
@@ -259,6 +256,7 @@
 Patch20:	%{name}-apxs.patch
 # http://www.telana.com/peruser.php
 Patch21:	httpd-2.0.52-peruser-0.1.6.patch
+Patch22:	%{name}-libtool.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	automake
 BuildRequires:	apr-devel >= 1:1.0.0
@@ -277,8 +275,8 @@
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	zlib-devel
-PreReq:		perl-base
-PreReq:		rc-scripts >= 0.4.0.15
+Requires:	perl-base
+Requires:	rc-scripts >= 0.4.0.15
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -569,8 +567,8 @@
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_autoindex
-This package contains mod_autoindex module. It provides
-generation index of files.
+This package contains mod_autoindex module. It provides generation
+index of files.
 
 %description mod_autoindex -l pl
 Ten pakiet dostarcza moduł autoindex, który generuje indeks plików.
@@ -937,26 +935,45 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
-%{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
-%{__perl} -pi -e "s at BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in
-%{__perl} -pi -e "s at CLEAN_SUBDIRS.*@CLEAN_SUBDIRS =@g" srclib/Makefile.in
+# using system apr, apr-util and pcre
+rm -rf srclib/{apr,apr-util,pcre}
+# nothing left in srclib, remove it
+sed -i -e '/^SUBDIRS/s/srclib//' Makefile.in
+
+# fixup perl path
+sed -i -e '1s@/usr/local/bin/perl@%{__perl}@' docs/cgi-examples/printenv
+
+# fix location of build dir in generated apxs
+sed -i -e '
+s:@exp_installbuilddir@:%{_libdir}/apache/build:g
+' support/apxs.in
 
-%build
 # sanity check
 MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h`
 if [ "$MODULES_API" != "%_apache_modules_api" ]; then
 	echo "Set %%_apache_modules_api to $MODULES_API and rerun."
 	exit 1
 fi
-./buildconf
-rm -rf srclib/apr*
-# Before configure; fix location of build dir in generated apxs
-%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/apache/build:g" \
-	support/apxs.in
-%{__perl} -pi -e "s:apr-config:apr-1-config:g" support/apxs.in
-%{__perl} -pi -e "s:apu-config:apu-1-config:g" support/apxs.in
-install /usr/share/automake/config.* build/
+
+%build
+cp /usr/share/apr/build/apr_common.m4 build
+cp /usr/share/libtool/ltmain.sh build
+cp /usr/share/automake/config.* build
+%{__autoheader}
+%{__autoconf}
+
+# from ./buildconf
+: fixing timestamps for mod_ssl sources
+cd modules/ssl
+touch ssl_expr_parse.y
+sleep 1
+touch ssl_expr_parse.c ssl_expr_parse.h ssl_expr_scan.l
+sleep 1
+touch ssl_expr_scan.c
+cd ../..
+
 CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
 for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} prefork worker; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
@@ -1740,9 +1757,11 @@
 %files mod_cache
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_cache.conf
+%attr(755,root,root) %{_sbindir}/htcacheclean
 %attr(755,root,root) %{_libexecdir}/mod_cache.so
 %attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
 %attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
+%{_mandir}/man8/htcacheclean.8*
 
 %files mod_cgid
 %defattr(644,root,root,755)
@@ -1802,6 +1821,7 @@
 
 %files mod_rewrite
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/httxt2dbm
 %attr(755,root,root) %{_libexecdir}/mod_rewrite.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_rewrite.conf
 
@@ -1837,7 +1857,7 @@
 %files -n htpasswd-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/htpasswd
-%{_sbindir}/htpasswd
+%attr(755,root,root) %{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*
 
 %files cgi_test
@@ -1852,6 +1872,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.424  2005/12/12 02:33:35  glen
+- add libtool patch
+- make %build re-entrant, cleanups (some hacks no longer needed)
+- package some missing files
+
 Revision 1.423  2005/12/11 23:08:40  glen
 - metuxmpm incompatible because of API changes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.423&r2=1.424&f=u