SPECS (DEVEL): eventum.spec - use apache config triggers

[glen]

Author: glen                         Date: Tue Jun 28 19:36:47 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- use apache config triggers

---- Files affected:
SPECS:
   eventum.spec (1.107.2.5 -> 1.107.2.6) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.107.2.5 SPECS/eventum.spec:1.107.2.6
--- SPECS/eventum.spec:1.107.2.5	Tue Jun 28 19:33:07 2005
+++ SPECS/eventum.spec	Tue Jun 28 21:36:42 2005
@@ -26,7 +26,7 @@
 %define	_source http://mysql.dataphone.se/Downloads/%{name}/%{name}-%{version}.tar.gz
 %endif
 
-%define	_rel	3.12
+%define	_rel	3.15
 
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl):	Eventum - system śledzenia spraw/błędów
@@ -74,7 +74,7 @@
 Patch18:	http://glen.alkohol.ee/pld/eventum-bot-reconnect-join.patch
 Patch19:	http://glen.alkohol.ee/pld/eventum-routing-pattern-fix.patch
 URL:		http://dev.mysql.com/downloads/other/eventum/
-BuildRequires:	rpmbuild(macros) >= 1.200
+BuildRequires:	rpmbuild(macros) >= 1.223
 BuildRequires:	sed >= 4.0
 Requires:	php >= 4.2.0
 Requires:	php-gd
@@ -113,9 +113,6 @@
 %define		_appdir	%{_datadir}/%{name}
 %define		_smartyplugindir	%{php_pear_dir}/Smarty/plugins
 
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
-
 %description
 Eventum is a user-friendly and flexible issue tracking system that can
 be used by a support department to track incoming technical support
@@ -574,21 +571,6 @@
 %addusertogroup http %{name}
 
 %post
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/conf.d/99_%{name}.conf
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
-fi
-# apache2
-if [ -d %{_apache2dir}/httpd.conf ]; then
-	ln -sf %{_sysconfdir}/apache.conf %{_apache2dir}/httpd.conf/99_%{name}.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
-fi
-
 # check if the package is configured.
 if grep -q 'header("Location: setup/")' %{_sysconfdir}/config.php; then
 if [ -f %{_appdir}/htdocs/setup/index.php ]; then
@@ -649,21 +631,6 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	# apache1
-	if [ -f %{_apache1dir}/apache.conf ]; then
-		rm -f %{_apache1dir}/conf.d/99_%{name}.conf
-		if [ -f /var/lock/subsys/apache ]; then
-			/etc/rc.d/init.d/apache restart 1>&2
-		fi
-	fi
-	# apache2
-	if [ -d %{_apache2dir}/httpd.conf ]; then
-		rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
-		if [ -f /var/lock/subsys/httpd ]; then
-			/etc/rc.d/init.d/httpd restart 1>&2
-		fi
-	fi
-
 	# nuke cache
 	rm -f /var/cache/eventum/*.php 2>/dev/null || :
 fi
@@ -714,6 +681,18 @@
 	chown root:eventum %{_sysconfdir}/{config,private_key}.php
 fi
 
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
+
 # FIXME
 # only one upgrade trigger is called if you're upgrading over two
 # versions, say 1.5 to 1.5.3, only 1.5.3 trigger is called.
@@ -866,8 +845,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107.2.6  2005/06/28 19:36:42  glen
+- use apache config triggers
+
 Revision 1.107.2.5  2005/06/28 17:33:07  glen
-- add bot reconnect join patchand routing pattern fix
+- add bot reconnect join patch and routing pattern fix
 
 Revision 1.107.2.4  2005/06/25 20:13:14  glen
 - rel 3.8
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.107.2.5&r2=1.107.2.6&f=u