- apache-apxs -> %{apxs} in BR

[packages/apache-mod_transform.git] / apache-mod_transform.spec

diff --git a/apache-mod_transform.spec b/apache-mod_transform.spec
index 63d942b2075c2740628d5786a49cb5b5c380795c..da43ddb63be6afef0534fe3039fb6b72be079379 100644 (file)
--- a/apache-mod_transform.spec
+++ b/apache-mod_transform.spec
@@ -1,10 +1,10 @@
 %define                mod_name        transform
 %define        apxs            /usr/sbin/apxs
 Summary:       Module to serve XML based content
-Summary(pl):   Modu³ do udostêpniania dokumentów XML
+Summary(pl.UTF-8):     Moduł do udostępniania dokumentów XML
 Name:          apache-mod_%{mod_name}
 Version:       0.4.0
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       http://www.outoforder.cc/downloads/mod_transform/mod_%{mod_name}-%{version}.tar.gz
@@ -12,34 +12,37 @@ Source0:    http://www.outoforder.cc/downloads/mod_transform/mod_%{mod_name}-%{vers
 Source1:       %{name}.conf
 URL:           http://www.outoforder.cc/projects/apache/mod_transform/
 BuildRequires: %{apxs}
+BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
-Requires(post,preun):  %{apxs}
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
+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
 mod_transform is a filter module that allows Apache 2.0 to do dynamic
 XSL Transformations on either static XML documents, or XML documents
 generated from another Apache module or CGI program.
 
-%description -l pl
-mod_transform to modu³ filtra umo¿liwiaj±cy serwerowi Apache 2.0
-wykonywaæ dynamiczne przekszta³cenia XML na statycznych dokumentach
-XML lub dokumentach XML generowanych przez inny modu³ Apache'a lub
+%description -l pl.UTF-8
+mod_transform to moduł filtra umożliwiający serwerowi Apache 2.0
+wykonywać dynamiczne przekształcenia XML na statycznych dokumentach
+XML lub dokumentach XML generowanych przez inny moduł Apache'a lub
 program CGI.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+sed -i -e "s:apr-config:apr-1-config:g" aclocal.m4 m4/apache.m4
+sed -i -e "s:apu-config:apu-1-config:g" aclocal.m4 m4/apache.m4
 
 %build
-%{__perl} -pi -e "s:apr-config:apr-1-config:g" aclocal.m4 m4/apache.m4
-%{__perl} -pi -e "s:apu-config:apu-1-config:g" aclocal.m4 m4/apache.m4
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -59,19 +62,15 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/61_mod_transform.con
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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
-       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 TODO
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so