- up to 1.1.9

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

diff --git a/apache1-mod_macro.spec b/apache1-mod_macro.spec
index c697c027d4136d0b1d1d86d87d6a6fd9a17134ce..60d14ed224a993d9ca3a5c4da333f613f5f30e07 100644 (file)
--- a/apache1-mod_macro.spec
+++ b/apache1-mod_macro.spec
@@ -1,28 +1,28 @@
 %define                mod_name        macro
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module to allow macros in apache config files
-Summary(pl):   Modu³ do apache pozwalaj±cy u¿ywaæ makr w konfiguracji
+Summary(pl.UTF-8):     Moduł do apache pozwalający używać makr w konfiguracji
 Name:          apache-mod_%{mod_name}
-Version:       1.1.6
-Release:       0.1
+Version:       1.1.9
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
 Source0:       http://www.cri.ensmp.fr/~coelho/mod_macro/mod_%{mod_name}-%{version}.tar.bz2
-# Source0-md5: c79c299f650b35292d3b71da19e42e45
+# Source0-md5: 0ce14d119ee47d9da6e0677edcf5f709
 URL:           http://www.cri.ensmp.fr/~coelho/mod_macro/
-BuildRequires: apache-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache
+BuildRequires: apache-devel >= 2.0
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Apache module to allow macros in apache config files.
 
-%description -l pl
-Modu³ do apache pozwalaj±cy u¿ywaæ makr w plikach konfiguracyjnych.
+%description -l pl.UTF-8
+Moduł do apache pozwalający używać makr w plikach konfiguracyjnych.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
@@ -32,28 +32,25 @@ Modu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/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 httpd 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 httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so