From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 21 Dec 2005 23:26:26 +0000 (+0000)
Subject: - rebuild with new apache
X-Git-Tag: auto/ac/apache-mod_cband-0_9_6_0-2
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2d7b94ee6b2227a4403c735c91822ecace44d124;p=packages%2Fapache-mod_cband.git

- rebuild with new apache
- kill pointless obsolete
- fix restart scriptlets
- rel 2

Changed files:
    apache-mod_cband.spec -> 1.9
---

diff --git a/apache-mod_cband.spec b/apache-mod_cband.spec
index 7be893a..e684a7d 100644
--- a/apache-mod_cband.spec
+++ b/apache-mod_cband.spec
@@ -1,30 +1,27 @@
 %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
@@ -56,15 +53,14 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/97_mod_%{mod_name}.c
 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