SPECS (AC-branch): apache.spec - apxs not used runtime, moved to -...

[glen]

Author: glen                         Date: Sun Dec  9 10:33:53 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- apxs not used runtime, moved to -devel
- rel 2

---- Files affected:
SPECS:
   apache.spec (1.498.2.7 -> 1.498.2.8) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.498.2.7 SPECS/apache.spec:1.498.2.8
--- SPECS/apache.spec:1.498.2.7	Sat Dec  8 14:14:54 2007
+++ SPECS/apache.spec	Sun Dec  9 11:33:47 2007
@@ -36,7 +36,7 @@
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.2.6
-Release:	1
+Release:	2
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -301,18 +301,6 @@
 %description errordocs -l pl.UTF-8
 Dokumenty opisujące błędy HTTP dla Apache'a w wielu językach.
 
-%package apxs
-Summary:	APache eXtenSion tool
-Summary(pl.UTF-8):	Narzędzie do rozszerzania Apache'a
-Group:		Development/Tools
-Requires:	apr-devel
-
-%description apxs
-APache eXtenSion tool.
-
-%description apxs -l pl.UTF-8
-Narzędzie do rozszerzania Apache'a.
-
 %package devel
 Summary:	Module development tools for the Apache web server
 Summary(es.UTF-8):	Archivos de inclusión del Apache para desarrollo de módulos
@@ -321,7 +309,7 @@
 Summary(pt_BR.UTF-8):	Arquivos de inclusão do Apache para desenvolvimento de módulos
 Summary(ru.UTF-8):	Средства разработки модулей для веб-сервера Apache
 Group:		Networking/Utilities
-Requires:	%{name}-apxs = %{version}-%{release}
+Obsoletes:	%{name}-apxs
 Requires:	apr-util-devel >= 1:1.2
 Requires:	libtool
 Obsoletes:	apache-static
@@ -1992,13 +1980,14 @@
 ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 
 # cgi_test: create config file with ScriptAlias
-cat << EOF > $CFG/09_cgi_test.conf
+cat << 'EOF' > $CFG/09_cgi_test.conf
 ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
 
 # no value
 rm $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.exp
 rm $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.prefork.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/{extra,original}
@@ -2130,7 +2119,7 @@
 NB! Apache main config has been changed to /etc/httpd/apache.conf
 
 There has been changed a lot, so many things could be broken.
-Please report bugs to http://bugs.pld-linux.org/.
+Please report bugs to <http://bugs.pld-linux.org/>.
 
 EOF
 
@@ -2268,9 +2257,7 @@
 %defattr(644,root,root,755)
 %doc ABOUT_APACHE CHANGES README
 %doc docs/conf/mime.types
-
 %attr(754,root,root) /etc/rc.d/init.d/httpd
-
 %attr(751,root,root) %dir %{_sysconfdir}
 %{_sysconfdir}/modules
 %{_sysconfdir}/run
@@ -2328,16 +2315,6 @@
 %{_datadir}/html/*.gif
 %{_datadir}/html/*.png
 
-%files apxs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/apxs
-%attr(755,root,root) %{_sbindir}/envvars*
-# package libexecdir also to -apxs, as -apxs and -devel don't require -base package
-%dir %{_libexecdir}
-%dir %{_libexecdir}/build
-%{_libexecdir}/build/config_vars.mk
-%{_mandir}/man8/apxs.8*
-
 %files tools
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ab
@@ -2353,11 +2330,14 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}
-# FIXME: httpd.exp needed only on AIX
-%{_libexecdir}/*.exp
+%attr(755,root,root) %{_sbindir}/apxs
+%attr(755,root,root) %{_sbindir}/envvars*
+%dir %{_libexecdir}/build
 %{_libexecdir}/build/[lprs]*.mk
+%{_libexecdir}/build/config_vars.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
+%{_includedir}
+%{_mandir}/man8/apxs.8*
 
 %files mod_actions
 %defattr(644,root,root,755)
@@ -2712,6 +2692,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.498.2.8  2007-12-09 10:33:47  glen
+- apxs not used runtime, moved to -devel
+- rel 2
+
 Revision 1.498.2.7  2007-12-08 13:14:54  glen
 - HEAD merge (logrotate dir)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.498.2.7&r2=1.498.2.8&f=u