SPECS (DEVEL): chora.spec, gollem.spec, imp.spec, ingo.spec, krono...

glen glen at pld-linux.org
Thu Jul 21 00:08:02 CEST 2005


Author: glen                         Date: Wed Jul 20 22:08:02 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- use apache config triggers

---- Files affected:
SPECS:
   chora.spec (1.33 -> 1.34) , gollem.spec (1.5 -> 1.6) , imp.spec (1.81.2.1 -> 1.81.2.2) , ingo.spec (1.5 -> 1.6) , kronolith.spec (1.17 -> 1.18) , trean.spec (1.4 -> 1.5) , turba.spec (1.39 -> 1.40) , whups.spec (1.7 -> 1.8) , wicked.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/chora.spec
diff -u SPECS/chora.spec:1.33 SPECS/chora.spec:1.34
--- SPECS/chora.spec:1.33	Mon May  9 19:50:38 2005
+++ SPECS/chora.spec	Thu Jul 21 00:07:56 2005
@@ -4,13 +4,14 @@
 Summary(pl):	Program do obsługi CVS przez WWW
 Name:		chora
 Version:	2.0
-Release:	1
+Release:	1.1
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/chora/%{name}-h3-%{version}.tar.gz
 # Source0-md5:	11f4b8ad6e0706026aefd0ee29eff7a5
 Source1:	%{name}.conf
 URL:		http://www.horde.org/chora/
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 # well. depending on configuration, it needs cvs, rcs or svn, cvsps >= 2.0b6
@@ -27,8 +28,6 @@
 %define		hordedir	/usr/share/horde
 %define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 Chora is the CVS viewing frontend, one of the Horde components. It
@@ -85,38 +84,17 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %files
 %defattr(644,root,root,755)
@@ -145,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.33  2005/05/09 17:50:38  glen
 - horde apps are all www applications (adjust group)
 

================================================================
Index: SPECS/gollem.spec
diff -u SPECS/gollem.spec:1.5 SPECS/gollem.spec:1.6
--- SPECS/gollem.spec:1.5	Wed Jul 13 11:23:38 2005
+++ SPECS/gollem.spec	Thu Jul 21 00:07:56 2005
@@ -16,6 +16,7 @@
 Source1:	%{name}.conf
 Patch0:		%{name}-prefs.patch
 URL:		http://www.horde.org/gollem/
+BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
@@ -30,8 +31,6 @@
 %define		hordedir	/usr/share/horde
 %define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 Gollem is the Horde File Manager, and works through any Horde_VFS
@@ -95,38 +94,17 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %files
 %defattr(644,root,root,755)
@@ -154,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.5  2005/07/13 09:23:38  paszczus
 - updated to 1.0rc1
 

================================================================
Index: SPECS/imp.spec
diff -u SPECS/imp.spec:1.81.2.1 SPECS/imp.spec:1.81.2.2
--- SPECS/imp.spec:1.81.2.1	Sun May 29 14:33:29 2005
+++ SPECS/imp.spec	Thu Jul 21 00:07:56 2005
@@ -11,7 +11,7 @@
 Summary(pt_BR):	Programa de Mail via Web
 Name:		imp
 Version:	4.0.4
-Release:	0.%(echo %{_snap} | tr -d -)
+Release:	0.%(echo %{_snap} | tr -d -).1
 License:	GPL v2
 Group:		Applications/WWW
 %if 0%{?_snap}
@@ -28,6 +28,7 @@
 Source5:	%{name}-ImpLibVersion.def
 Patch0:		%{name}-path.patch
 URL:		http://www.horde.org/imp/
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
@@ -43,8 +44,6 @@
 %define		hordedir	/usr/share/horde
 %define		_sysconfdir		/etc/horde.org
 %define		_appdir		%{hordedir}/%{name}
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 IMP is the Internet Messaging Program, one of the Horde components. It
@@ -109,38 +108,17 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %triggerpostun -- imp <= 3.2.6-0.1
 for i in conf.php filter.txt header.txt html.php menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
@@ -186,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81.2.2  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.81.2.1  2005/05/29 12:33:29  glen
 - 2005-05-21 snap (WORKSFORME)
 

================================================================
Index: SPECS/ingo.spec
diff -u SPECS/ingo.spec:1.5 SPECS/ingo.spec:1.6
--- SPECS/ingo.spec:1.5	Mon May  9 19:50:38 2005
+++ SPECS/ingo.spec	Thu Jul 21 00:07:56 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Ingo - zarządca reguł filtrowania poczty elektronicznej
 Name:		ingo
 Version:	1.0.1
-Release:	1
+Release:	1.1
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/ingo/%{name}-h3-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Source1:	%{name}.conf
 Patch0:		%{name}-path.patch
 URL:		http://www.horde.org/ingo/
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
@@ -25,8 +26,6 @@
 %define		hordedir	/usr/share/horde
 %define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 Ingo currently supports the following filtering drivers:
@@ -97,38 +96,17 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %files
 %defattr(644,root,root,755)
@@ -155,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.5  2005/05/09 17:50:38  glen
 - horde apps are all www applications (adjust group)
 

================================================================
Index: SPECS/kronolith.spec
diff -u SPECS/kronolith.spec:1.17 SPECS/kronolith.spec:1.18
--- SPECS/kronolith.spec:1.17	Mon May  9 19:50:38 2005
+++ SPECS/kronolith.spec	Thu Jul 21 00:07:56 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Kronolith - kalendarz dla HORDE
 Name:		kronolith
 Version:	2.0.3
-Release:	0.1
+Release:	0.2
 License:	LGPL
 Vendor:		The Horde Project
 Group:		Applications/WWW
@@ -12,7 +12,7 @@
 # Source0-md5:	a17f41f0724acec5e561cfd7300759bd
 Source1:	%{name}.conf
 URL:		http://www.horde.org/kronolith/
-BuildRequires:	rpmbuild(macros) >= 1.177
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
@@ -27,8 +27,6 @@
 %define		hordedir	/usr/share/horde
 %define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 Kronolith is the Horde calendar application. It provides a stable and
@@ -96,21 +94,6 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
-
 if [ "$1" = 1 ]; then
 %banner %{name} -e <<EOF
 IMPORTANT:
@@ -121,23 +104,17 @@
 EOF
 fi
 
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.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-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %files
 %defattr(644,root,root,755)
@@ -164,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.17  2005/05/09 17:50:38  glen
 - horde apps are all www applications (adjust group)
 

================================================================
Index: SPECS/trean.spec
diff -u SPECS/trean.spec:1.4 SPECS/trean.spec:1.5
--- SPECS/trean.spec:1.4	Thu May 12 20:15:27 2005
+++ SPECS/trean.spec	Thu Jul 21 00:07:56 2005
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 
 %define	_snap	2005-05-11
-%define	_rel	1
+%define	_rel	1.1
 
 %include	/usr/lib/rpm/macros.php
 Summary:	Horde Bookmarks application
@@ -17,6 +17,7 @@
 NoSource:	0
 Source1:	%{name}.conf
 URL:		http://www.horde.org/trean/
+BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 # docs say it requires 3.1, but seems work in 3.0 too
@@ -31,8 +32,6 @@
 %define		hordedir	/usr/share/horde
 %define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 The Trean (Bookmarks) application allows you to store, organize and
@@ -105,40 +104,6 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
-
-%postun
-if [ "$1" = "0" ]; then
-	# apache1
-	if [ -d %{_apache1dir}/conf.d ]; 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
-fi
-
-
 if [ "$1" = 1 ]; then
 %banner %{name} -e <<EOF
 IMPORTANT:
@@ -147,6 +112,18 @@
 EOF
 fi
 
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.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-%{name}.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
+
 %files
 %defattr(644,root,root,755)
 %doc README docs/*
@@ -172,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/07/20 22:07:56  glen
+- use apache config triggers
+
 Revision 1.4  2005/05/12 18:15:27  qboosh
 - pl
 

================================================================
Index: SPECS/turba.spec
diff -u SPECS/turba.spec:1.39 SPECS/turba.spec:1.40
--- SPECS/turba.spec:1.39	Mon Jun 20 21:46:33 2005
+++ SPECS/turba.spec	Thu Jul 21 00:07:56 2005
@@ -4,7 +4,7 @@
 Summary(pl):	TURBA - Książka adresowa dla IMP-a
 Name:		turba
 Version:	2.0.2
-Release:	2.1
+Release:	2.2
 License:	LGPL
 Vendor:		The Horde Project
 Group:		Applications/WWW
@@ -32,8 +32,6 @@
 %define		schemadir	/usr/share/openldap/schema
 %define		_sysconfdir	/etc/horde.org
 %define		_appdir		%{hordedir}/%{name}
-%define		_apache1dir	/etc/apache
-%define		_apache2dir	/etc/httpd
 
 %description
 Turba is a complete basic contact management application. SQL, LDAP,
@@ -126,21 +124,6 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
 fi
 
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache-%{name}.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-%{name}.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
-
 if [ "$1" = 1 ]; then
 %banner %{name} -e <<EOF
 IMPORTANT:
@@ -156,24 +139,6 @@
 EOF
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/chora.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.81.2.1&r2=1.81.2.2&f=u
    http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/kronolith.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/turba.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/whups.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/wicked.spec?r1=1.5&r2=1.6&f=u




More information about the pld-cvs-commit mailing list