SPECS: apache-mod_cband.spec - rebuild with new apache - kill poin...

[glen]

Author: glen                         Date: Wed Dec 21 23:26:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rebuild with new apache
- kill pointless obsolete
- fix restart scriptlets
- rel 2

---- Files affected:
SPECS:
   apache-mod_cband.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_cband.spec
diff -u SPECS/apache-mod_cband.spec:1.8 SPECS/apache-mod_cband.spec:1.9
--- SPECS/apache-mod_cband.spec:1.8	Thu Dec  8 19:24:25 2005
+++ SPECS/apache-mod_cband.spec	Thu Dec 22 00:26:26 2005
@@ -1,31 +1,28 @@
 # $Revision$, $Date$
 %define		mod_name	cband
 %define 	apxs		/usr/sbin/apxs
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-
 Summary:	Apache module: bandwidth limits per vhosts
 Summary(pl):	Moduł do Apache: limity pasma dla poszczególnych vhostów
 Name:		apache-mod_%{mod_name}
 Version:	0.9.6.0
-Release:	1
+Release:	2
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://cband.linux.pl/download/mod-%{mod_name}-%{version}.tgz
 # Source0-md5:	6df461ef7cc61c5133a0d69deefe1902
 Source1:	%{name}.conf
 URL:		http://cband.linux.pl/
-BuildRequires:	apache-devel >= 2.0.0
 BuildRequires:	%{apxs}
-Requires(post,preun):	%{apxs}
-Requires(post,preun):	grep
-Requires(preun):	fileutils
+BuildRequires:	apache-devel >= 2.0.0
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache >= 2.0.0
 Requires:	crondaemon
 Requires:	procps
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+
 %description
 mod_cband is an Apache 2 module provided to solve the problem of
 limiting users' and virtualhosts' bandwidth usage. When the configured
@@ -57,15 +54,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	umask 027
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
+	if [ -f /var/lock/subsys/httpd ]; then
+		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
 fi
 
@@ -81,11 +77,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/21 23:26:26  glen
+- rebuild with new apache
+- kill pointless obsolete
+- fix restart scriptlets
+- rel 2
+
 Revision 1.8  2005/12/08 18:24:25  dzeus
 - up to 0.9.6.0
 
 Revision 1.7  2005/11/03 18:24:01  paszczus
-- updated to 0.9.5.3 ; STBR
+- updated to 0.9.5.3; STBR
 
 Revision 1.6  2005/10/22 22:06:33  paszczus
 - updated to 0.9.5.2
================================================================

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