SPECS: apache-mod_bw.spec - rebuild with new apache - kill pointle...
glen
glen at pld-linux.org
Thu Dec 22 00:15:42 CET 2005
Author: glen Date: Wed Dec 21 23:15:42 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_bw.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: SPECS/apache-mod_bw.spec
diff -u SPECS/apache-mod_bw.spec:1.22 SPECS/apache-mod_bw.spec:1.23
--- SPECS/apache-mod_bw.spec:1.22 Mon Dec 12 14:44:44 2005
+++ SPECS/apache-mod_bw.spec Thu Dec 22 00:15:37 2005
@@ -7,7 +7,7 @@
Summary(pl): Moduł do Apache: limity pasma
Name: apache-mod_%{mod_name}
Version: 0.6
-Release: 1
+Release: 2
License: Apache
Group: Networking/Daemons
Source0: http://www.ivn.cl/apache/bw_mod-%{version}.tgz
@@ -17,17 +17,15 @@
URL: http://www.ivn.cl/apache/
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.0.0
-Requires(post,preun): %{apxs}
-Requires(post,preun): grep
-Requires(preun): fileutils
+BuildRequires: sed >= 4.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)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
"Mod_bandwidth" is a module for the Apache webserver that enable the
@@ -43,8 +41,8 @@
%patch0 -p1
%build
-perl -pi -e 's at include "apr at include "apr/apr at g' bw_mod-%{version}.c
-perl -pi -e 's@^.*apr_buckets.h.*$@@' bw_mod-%{version}.c
+sed -i -e 's at include "apr at include "apr/apr at g' bw_mod-%{version}.c
+sed -i -e 's@^.*apr_buckets.h.*$@@' bw_mod-%{version}.c
%{apxs} -c bw_mod-%{version}.c
mv .libs/bw_mod-%{version}.so mod_bw.so
@@ -61,15 +59,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
@@ -90,6 +87,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2005/12/21 23:15:37 glen
+- rebuild with new apache
+- kill pointless obsolete
+- fix restart scriptlets
+- rel 2
+
Revision 1.22 2005/12/12 13:44:44 glen
- adapterized (sorted %verify attrs)
@@ -106,7 +109,7 @@
- works fine, release 0.3
Revision 1.18 2005/03/12 12:55:08 adamg
-- dropped %%{_ver} macro, use %%{version} where possible
+- dropped %{_ver} macro, use %{version} where possible
- added LICENSE file
- added TODO entry (think about renaming this spec)
- release 0.2
@@ -126,5 +129,3 @@
Revision 1.13 2005/03/02 19:14:23 mwinkler
- mod_bandwitch apache2, NFY
-
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache-mod_bw.spec?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list