- mv apache{,1}-*; epoch 1

Changed files:
    apache1-mod_ntlm.spec -> 1.16

diff --git a/apache1-mod_ntlm.spec b/apache1-mod_ntlm.spec
index 060db350d6de89e7c6139ed64505bfea30b94fe3..660cfa712a5155d15b38562f1867d82ee5987260 100644 (file)
--- a/apache1-mod_ntlm.spec
+++ b/apache1-mod_ntlm.spec
@@ -1,10 +1,11 @@
 %define                mod_name        ntlm
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       This is the NTLM authentication module for Apache
 Summary(pl):   Modu³ uwierzytelnienia NTLM dla Apache
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       0.4
 Release:       1
+Epoch:         1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/modntlm/mod_%{mod_name}-%{version}.tar.gz
@@ -12,9 +13,10 @@ Source0:     http://dl.sourceforge.net/modntlm/mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-security.patch
 URL:           http://modntlm.sourceforge.net/
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache(EAPI)
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{epoch}:%{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -34,7 +36,7 @@ u
 %patch -p1
 
 %build
-PATH=$PATH:/usr/sbin %{__make}
+%{__make} APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +49,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
+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
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi