SPECS: template-apache-package.spec - as per discussion in devel-e...

[glen]

Author: glen                         Date: Tue Nov 15 22:41:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- as per discussion in devel-en, unify virtual webserver usage

---- Files affected:
SPECS:
   template-apache-package.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/template-apache-package.spec
diff -u SPECS/template-apache-package.spec:1.23 SPECS/template-apache-package.spec:1.24
--- SPECS/template-apache-package.spec:1.23	Sun Oct  2 13:42:49 2005
+++ SPECS/template-apache-package.spec	Tue Nov 15 23:41:10 2005
@@ -7,13 +7,16 @@
 License:	GPL
 Group:		Development
 BuildRequires:	rpmbuild(macros) >= 1.226
-Requires:	apache >= 1.3.33-2
+Requires:	webserver = apache
 %if %{with trigger}
 Requires(triggerpostun):	sed >= 4.0
 %endif
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir	/etc/%{name}
+
 %description
 This spec is for demonstrating triggers used for linking package
 config to apache1/apache2 configuration dir.
@@ -72,7 +75,7 @@
 	fi
 fi
 
-# nuke very-old config location (is this needed?)
+# nuke very-old config location (this mostly for Ra)
 if [ ! -d /etc/httpd/httpd.conf ]; then
 	sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then
@@ -112,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/11/15 22:41:10  glen
+- as per discussion in devel-en, unify virtual webserver usage
+
 Revision 1.23  2005/10/02 11:42:49  glen
 - use sed 4.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-apache-package.spec?r1=1.23&r2=1.24&f=u