SPECS: apache-mod_bw.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:12:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_bw.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_bw.spec
diff -u SPECS/apache-mod_bw.spec:1.23 SPECS/apache-mod_bw.spec:1.24
--- SPECS/apache-mod_bw.spec:1.23	Thu Dec 22 00:15:37 2005
+++ SPECS/apache-mod_bw.spec	Mon Dec 26 20:12:50 2005
@@ -19,7 +19,6 @@
 BuildRequires:	apache-devel >= 2.0.0
 BuildRequires:	sed >= 4.0
 Requires:	apache(modules-api) = %apache_modules_api
-Requires:	apache >= 2.0.0
 Requires:	crondaemon
 Requires:	procps
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,20 +38,19 @@
 %prep
 %setup -q -n bw_mod-%{version}
 %patch0 -p1
-
-%build
 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
+
+%build
 %{apxs} -c bw_mod-%{version}.c
-mv .libs/bw_mod-%{version}.so mod_bw.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}} \
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf} \
 	$RPM_BUILD_ROOT%{_var}/run/%{name}/{link,master} \
-	$RPM_BUILD_ROOT{/etc/cron.d,%{_sbindir},%{_sysconfdir}/httpd.conf}
+	$RPM_BUILD_ROOT{/etc/cron.d,%{_sbindir}}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install .libs/bw_mod-%{version}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/97_mod_%{mod_name}.conf
 
 %clean
@@ -73,7 +71,7 @@
 %files
 %defattr(644,root,root,755)
 %doc bw_mod-%{version}.txt LICENSE
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 #%config(noreplace) %verify(not size mtime md5) %attr(640,root,root) /etc/cron.d/%{name}
 #%attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_pkglibdir}/*
@@ -87,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/12/26 19:12:50  glen
+- unified
+
 Revision 1.23  2005/12/21 23:15:37  glen
 - rebuild with new apache
 - kill pointless obsolete
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_bw.spec?r1=1.23&r2=1.24&f=u