- obsoletes with constant version

[packages/apache1-mod_throttle.git] / apache1-mod_throttle.spec

diff --git a/apache1-mod_throttle.spec b/apache1-mod_throttle.spec
index cd07f96309bc3b79d82569ca2341e8c2f9337691..09ae5431d7aef2399428c524898daf2f64367be4 100644 (file)
--- a/apache1-mod_throttle.spec
+++ b/apache1-mod_throttle.spec
@@ -1,3 +1,5 @@
+%bcond_without ipv6            # disable IPv6 support
+
 %define                mod_name        throttle
 %define        apxs            /usr/sbin/apxs1
 Summary:       Bandwidth & Request Throttling for Apache
@@ -12,7 +14,7 @@ Summary(pt_BR):       Descompress
 Summary(sv):   En modul som implementerar bandvidd- och begäranbegränsningar i Apache
 Name:          apache1-mod_%{mod_name}
 Version:       3.1.2
-Release:       1
+Release:       3
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://www.snert.com/Software/mod_throttle/mod_throttle312.tgz
@@ -20,13 +22,16 @@ Source0:    http://www.snert.com/Software/mod_throttle/mod_throttle312.tgz
 Patch0:                apache1-mod_throttle-PLD-v6stuff.patch
 URL:           http://www.snert.com/Software/mod_throttle/
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.1
-Requires(post,preun):  %{apxs}
-Requires:      apache1 >= 1.3.1
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+#{?with_ipv6:BuildRequires:    apache1(ipv6)-devel}
+BuildRequires: apache1-devel >= 1.3.33-2
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1 >= 1.3.33-2
+Obsoletes:     apache-mod_%{mod_name} <= 3.1.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                _pkglogdir      %(%{apxs} -q PREFIX 2>/dev/null)/logs
 
 %description
 This Apache module is intended to reduce the load on your server &
@@ -88,39 +93,50 @@ v
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
+%{?with_ipv6:%patch0 -p1}
 
 %build
 %{apxs} -o mod_%{mod_name}.so -c mod_%{mod_name}.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,%{_pkglogdir}}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+echo 'LoadModule %{mod_name}_module    modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+
 sed -e 's/<!--#/<!--/g' index.shtml > mod_%{mod_name}.html
 
+> $RPM_BUILD_ROOT%{_pkglogdir}/mod_throttle.runtime
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n throttle %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 if [ -f /var/lock/subsys/apache ]; then
        /etc/rc.d/init.d/apache restart 1>&2
 else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n throttle %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
+%triggerpostun -- apache1-mod_%{mod_name} < 3.1.2-1.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc *.txt *.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
+%attr(660,root,http) %ghost %{_pkglogdir}/*