- raw

Changed files:
    apache-mod_bw.spec -> 1.12

diff --git a/apache-mod_bw.spec b/apache-mod_bw.spec
index affa9279fc281f32aadb8b974dd0df69e7864c33..47b52406c26aed06b95201c43df53bdd6fad6b94 100644 (file)
--- a/apache-mod_bw.spec
+++ b/apache-mod_bw.spec
@@ -1,27 +1,22 @@
 %define                mod_name        bandwidth
-%define        apxs            /usr/sbin/apxs1
+%define        apxs            /usr/sbin/apxs
 Summary:       Apache module: bandwidth limits
 Summary(pl):   Modu³ do Apache: limity pasma
-Name:          apache1-mod_%{mod_name}
-Version:       2.0.5
-Release:       1
+Name:          apache-mod_%{mod_name}
+Version:       0.1
+Release:       0.1
 License:       Apache
 Group:         Networking/Daemons
-Source0:       ftp://ftp.cohprog.com/pub/apache/module/1.3.0/mod_bandwidth.c
-# Source0-md5: 00f0905d777f79485beb428b53191ecf
-# ftp://ftp.cohprog.com/pub/apache/module/cleanlink.pl
-# modified to work from cron NOT as daemon!
-Source1:       %{name}-cleanlink.pl
-Source2:       %{name}.conf
-# http://www.cohprog.com/v3/bandwidth/doc-en.html
-Source4:       %{name}-doc.html
-URL:           http://www.cohprog.com/v3/bandwidth/intro-en.html
-BuildRequires: apache1-devel
+Source0:       http://www.ivn.cl/apache/mod_%{mod_name}-%{version}.tgz
+# Source0-md5: 8a2efaee819f97e33aa352f630448b93
+Source1:       %{name}.conf
+URL:           http://www.ivn.cl/apache/
+BuildRequires: apache-devel >= 2.0.0
 BuildRequires: %{apxs}
 Requires(post,preun):  %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
-Requires:      apache1
+Requires:      apache >= 2.0.0
 Requires:      crondaemon
 Requires:      procps
 Obsoletes:     apache-mod_%{mod_name} <= %{version}
@@ -40,11 +35,10 @@ Modu
 na katalogu, wielko¶ci plików oraz zdalnym IP/domenie.
 
 %prep
-%setup -q -T -c
-cp %{SOURCE0} .
+%setup -q -n mod_%{mod_name}-%{version}
 
 %build
-%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
+%{apxs} -c mod_%{mod_name}-%{version}.c -o mod_%{mod_name}.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,32 +47,19 @@ install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}} \
        $RPM_BUILD_ROOT{/etc/cron.d,%{_sbindir}}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mod_%{mod_name}.conf
-install %{SOURCE4} .
-
-echo '* * * * * http %{_sbindir}/%{name}-cleanlink.pl' > \
-       $RPM_BUILD_ROOT/etc/cron.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_%{mod_name}.conf" /etc/apache/apache.conf; then
-       echo "Include /etc/apache/mod_%{mod_name}.conf" >> /etc/apache/apache.conf
-fi
 if [ -f /var/lock/subsys/apache ]; then
        /etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        umask 027
-       grep -v "^Include.*mod_%{mod_name}.conf" /etc/apache/apache.conf > \
-               /etc/apache/apache.conf.tmp
-       mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi