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

Changed files:
    apache1-mod_sqlinclude.spec -> 1.14

diff --git a/apache1-mod_sqlinclude.spec b/apache1-mod_sqlinclude.spec
index 3e41eb32d43afa73333c25fb4225d7bba991a836..9a59841d508fd208f0d38aca9bd67160543e71b7 100644 (file)
--- a/apache1-mod_sqlinclude.spec
+++ b/apache1-mod_sqlinclude.spec
@@ -1,23 +1,24 @@
 %define                mod_name        sqlinclude
-%define                apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs1
 Summary:       Apache module: mySQL based "Include"-alike configuration command
 Summary(pl):   Modu³ do apache: bazuj±ca na mySQL komenda konfiguracji ala "Include"
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       1.4
-Release:       4
+Release:       1
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/mod-sqlinclude/mod_sqlinclude-%{version}.tgz
 # Source0-md5: ecb1fd5d5a89c55e7dda4a9a456b0c13
 URL:           http://sourceforge.net/projects/mod-sqlinclude/
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 BuildRequires: mysql-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache(EAPI)
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     /etc/httpd
+%define                _sysconfdir     /etc/apache
 
 %description
 mod_sqlinclude is an Apache Web server module which implements mySQL
@@ -33,7 +34,8 @@ konfiguracj
 %setup -q -n mod_%{mod_name}-%{version}
 
 %build
-%{__make}
+%{__make} \
+       APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,15 +48,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