SPECS: apache.spec - use sed rather perl to do inline replaces (as...

Wed Dec 14 21:31:15 CET 2005

Author: glen                         Date: Wed Dec 14 20:31:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use sed rather perl to do inline replaces (as perl ignores inexistent files)
- removed no-longer-needed inline edits
- fixed /etc/httpd ownership (main pkg no longer needs apxs)
- fixed build dir ownerships (main vs apxs vs devel)
- main requires mod_version, so you can always use that module (write compatible configs for different versions, sadly 2.2.+ only (for now?))

---- Files affected:
SPECS:
   apache.spec (1.433 -> 1.434) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.433 SPECS/apache.spec:1.434

--- SPECS/apache.spec:1.433	Wed Dec 14 20:17:27 2005
+++ SPECS/apache.spec	Wed Dec 14 21:31:09 2005
@@ -40,7 +40,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.0
-Release:	0.5
+Release:	0.7
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -89,7 +89,7 @@
 BuildRequires:	apr-util-devel >= 1:1.0.0
 BuildRequires:	automake
 BuildRequires:	db-devel
-%{?with_distcache:BuildRequires:	distcache-libs-devel or distcache-devel}
+%{?with_distcache:BuildRequires:	distcache-devel}
 BuildRequires:	expat-devel
 BuildRequires:	findutils
 BuildRequires:	gdbm-devel >= 1.8.3
@@ -102,6 +102,7 @@
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
@@ -111,6 +112,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	%{name}-mod_version = %{version}-%{release}
 Requires:	/etc/mime.types
 Requires:	/sbin/chkconfig
 Requires:	apr >= 1:1.0.0-2
@@ -119,7 +121,6 @@
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.0.15
 Provides:	apache(modules-api) = %{_apache_modules_api}
-#Provides:	apache(mod_access)
 Provides:	apache(mod_alias)
 Provides:	apache(mod_asis)
 Provides:	apache(mod_autoindex)
@@ -975,7 +976,7 @@
 sed -i -e '/^SUBDIRS/s/srclib//' Makefile.in
 
 # fixup perl path
-sed -i -e '1s@/usr/local/bin/perl@%{__perl}@' docs/cgi-examples/printenv
+sed -i -e '1s@#!.*local/bin/perl@#!%{__perl}@' docs/cgi-examples/printenv
 
 # fix location of build dir in generated apxs
 sed -i -e '
@@ -1135,23 +1136,14 @@
 done
 
 ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd
-
 ln -s %{_libdir}/apache $RPM_BUILD_ROOT%{_sysconfdir}/modules
 ln -s %{_localstatedir}/run/apache $RPM_BUILD_ROOT%{_sysconfdir}/run
-ln -s %{_libdir}/apache/build $RPM_BUILD_ROOT%{_sysconfdir}/build
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/build \
-	$RPM_BUILD_ROOT%{_libexecdir}/build
-
-%{__perl} -pi -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
-%{__perl} -pi -e "s#$RPM_BUILD_DIR#%{_usrsrc}#g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
-%{__perl} -pi -e "s#-pthread#-lpthread#g" $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{__perl} -pi -e 's#/etc/httpd/build#%{_libexecdir}/build#g' $RPM_BUILD_ROOT%{_libexecdir}/build/*
-ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_libexecdir}/build/libtool
-ln -sf %{_libexecdir}/build $RPM_BUILD_ROOT%{_sysconfdir}/build
+mv $RPM_BUILD_ROOT{%{_sysconfdir},%{_libexecdir}}/build
+ln -s %{_libdir}/apache/build $RPM_BUILD_ROOT%{_sysconfdir}/build
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
@@ -1234,6 +1226,9 @@
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
 
+# no value
+rm $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1602,6 +1597,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/httpd
 
 # TODO: switch to conf.d, instead of confusing *dir* httpd.conf
+%attr(751,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(750,root,root) %dir %{_sysconfdir}/modules
@@ -1612,7 +1608,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 
-#%attr(755,root,root) %{_libexecdir}/mod_access.so
+%dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/mod_alias.so
 %attr(755,root,root) %{_libexecdir}/mod_asis.so
 %attr(755,root,root) %{_libexecdir}/mod_cern_meta.so
@@ -1689,8 +1685,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/apxs
 %attr(755,root,root) %{_sbindir}/envvars*
-%attr(751,root,root) %dir %{_sysconfdir}
-%dir %{_libexecdir}
 %dir %{_libexecdir}/build
 %{_libexecdir}/build/config_vars.mk
 %{_mandir}/man8/apxs.8*
@@ -1699,10 +1693,10 @@
 %defattr(644,root,root,755)
 %{_includedir}
 %{_libexecdir}/*.exp
-%attr(750,root,root) %dir %{_sysconfdir}/build
+# is this symlink needed?
+%{_sysconfdir}/build
 %{_libexecdir}/build/[lprs]*.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
-%attr(755,root,root) %{_libexecdir}/build/libtool
 
 %files mod_actions
 %defattr(644,root,root,755)
@@ -1966,6 +1960,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.434  2005/12/14 20:31:09  glen
+- use sed rather perl to do inline replaces (as perl ignores inexistent files)
+- removed no-longer-needed inline edits
+- fixed /etc/httpd ownership (main pkg no longer needs apxs)
+- fixed build dir ownerships (main vs apxs vs devel)
+- main requires mod_version, so you can always use that module (write compatible configs for different versions, sadly 2.2.+ only (for now?))
+
 Revision 1.433  2005/12/14 19:17:27  glen
 - removed obsolete packages, finished %post scripts
 
================================================================

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


