- apxs1 in apache1-devel now

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

diff --git a/apache1-mod_gunzip.spec b/apache1-mod_gunzip.spec
index 41509202c9dd24d3f029fa2604fed71ed66a12e3..0aa5d9ccef664fa2214d656f0e2c6082857f962a 100644 (file)
--- a/apache1-mod_gunzip.spec
+++ b/apache1-mod_gunzip.spec
@@ -1,35 +1,38 @@
 %define                mod_name        gunzip
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: On-the-fly decompression of HTML documents
-Summary(es):   Descompresión instantanea de archivos HTML para Apache
-Summary(pl):   Modu³ do apache: dekompresuje dokumenty HTML w locie
-Summary(pt_BR):        Descompressão "On-the-fly" de arquivos HTML para o Apache
-Name:          apache-mod_%{mod_name}
+Summary(es.UTF-8):     Descompresión instantanea de archivos HTML para Apache
+Summary(pl.UTF-8):     Moduł do apache: dekompresuje dokumenty HTML w locie
+Summary(pt_BR.UTF-8):  Descompressão "On-the-fly" de arquivos HTML para o Apache
+Name:          apache1-mod_%{mod_name}
 Version:       1
 Release:       3
-License:       GPL
+License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://sep.hamburg.com/mod_%{mod_name}.tar.gz
-BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+# Source0-md5: 9f549047abccccf6570333bb0313d2cd
+BuildRequires: apache1-devel >= 1.3.39
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
-Prereq:                %{_sbindir}/apxs
-Requires:      apache(EAPI)
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_gunzip <= 1
 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)
 
 %description
 Apache module: On-the-fly decompression of HTML documents.
 
-%description -l es
-Descompresión instantanea de archivos HTML para Apache.
+%description -l es.UTF-8
+Descompresión instantanea de archivos HTML para Apache.
 
-%description -l pl
-Modu³ do apache: dekompresuje dokumenty HTML w locie.
+%description -l pl.UTF-8
+Moduł do apache: dekompresuje dokumenty HTML w locie.
 
-%description -l pt_BR
-Descompressão "On-the-fly" de arquivos HTML para o Apache.
+%description -l pt_BR.UTF-8
+Descompressão "On-the-fly" de arquivos HTML para o Apache.
 
 %prep
 %setup -q -n mod_%{mod_name}
@@ -39,27 +42,32 @@ Descompress
 
 %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
-%{_sbindir}/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       %{_sysconfdir}/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       %{_sbindir}/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
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- apache1-mod_%{mod_name} < 1-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 README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*