- use apache1(EAPI) for runtime dep

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

diff --git a/apache1-mod_hosts_access.spec b/apache1-mod_hosts_access.spec
index 37464705b3995d20c7f6651bb10d058fb97bfdaf..736be53f894243a408eff84c4ff0f87aaba32400 100644 (file)
--- a/apache1-mod_hosts_access.spec
+++ b/apache1-mod_hosts_access.spec
@@ -1,31 +1,31 @@
 %define                mod_name        hosts_access
-%define        apxs            %{_sbindir}/apxs1
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: access defined by hosts.allow/hosts.deny
-Summary(pl):   Modu³ do apache: dostêp na podstawie hosts.allow/hosts.deny
+Summary(pl.UTF-8):     Moduł do apache: dostęp na podstawie hosts.allow/hosts.deny
 Name:          apache1-mod_%{mod_name}
 Version:       1.0.0
-Release:       0.1
+Release:       0.4
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.klomp.org/mod_hosts_access/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 3720e303cfde50e94586f484a903aa41
 URL:           http://www.klomp.org/mod_hosts_access/
-BuildRequires: apache1-devel
+BuildRequires: apache1-devel >= 1.3.39
 BuildRequires: libwrap-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache1
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache1(EAPI)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     /etc/httpd
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Mod_hosts_access allows you to use the hosts.allow and hosts.deny
 files to configure access to your apache webserver.
 
-%description -l pl
-Mod_hosts_access pozwala u¿ywaæ plików hosts.allow i hosts.deny do
-okre¶lania dostêpu do zasobów serwera WWW apache.
+%description -l pl.UTF-8
+Mod_hosts_access pozwala używać plików hosts.allow i hosts.deny do
+określania dostępu do zasobów serwera WWW apache.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
@@ -35,28 +35,26 @@ okre
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 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
+
 %clean
 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
-fi
+%service -q apache restart
 
-%preun
+%postun
 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
-       fi
+       %service -q apache restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README INSTALL
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*