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

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

diff --git a/apache-mod_clamav.spec b/apache-mod_clamav.spec
index b6fe1defd55384667cede3bf113a931efa2777dc..b20ddaa9f75e61ed3e135d8596c78bcb76b8cdda 100644 (file)
--- a/apache-mod_clamav.spec
+++ b/apache-mod_clamav.spec
@@ -1,82 +1,81 @@
-# $Revision: 1.1 $
-%define        apxs    /usr/sbin/apxs
-%define         mod_name        clamav
-Summary:       an Apache virus scanning filter
+# TODO
+# - fix build with new apache/apr (apr_off_t)
+%define        apxs            /usr/sbin/apxs
+%define                mod_name        clamav
+Summary:       An Apache virus scanning filter
+Summary(pl.UTF-8):     Filtr skanera antywirusowego dla Apache'a
 Name:          apache-mod_%{mod_name}
-Version:       0.12
-Release:       1
+Version:       0.21
+Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://software.othello.ch/mod_clamav/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: 98bd0d8628be8ddeae21da6623e57d20
 Source1:       %{name}.conf
 Patch0:                %{name}-libtool-tag.patch
 URL:           http://software.othello.ch/mod_clamav/
 BuildRequires: %{apxs}
+BuildRequires: apache-devel >= 2.0
+BuildRequires: apr-devel >= 1:1.0
+BuildRequires: apr-util-devel >= 1:1.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: apache-devel
-BuildRequires: apr-devel
-BuildRequires: apr-util-devel
-Requires:      apache >= 2
+BuildRequires: clamav-devel
+BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
 Requires:      apache-mod_proxy
 Requires:      clamav
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
-%define         _libexecdir     %{_libdir}/apache
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 mod_clamav is an Apache 2 filter which scans the content delivered by
 the proxy module (mod_proxy) for viruses using the Clamav virus
 scanning engine.
 
+%description -l pl.UTF-8
+mod_clamav to filtr dla serwera Apache 2 skanujący treści dostarczane
+przez moduł proxy (mod_proxy) pod kątem wirusów przy użyciu silnika
+skanera antywirusowego Clamav.
+
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p0
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 
-CPPFLAGS="${CPPFLAGS} -I `/usr/bin/apr-config --includedir`"
-CPPFLAGS="${CPPFLAGS} -I `/usr/bin/apu-config --includedir`"
-export CPPFLAGS
-
+CPPFLAGS="-I `/usr/bin/apr-1-config --includedir` -I `/usr/bin/apu-1-config --includedir`"
 %configure \
-        --with-apxs=%{apxs}
-
+       --with-apxs=%{apxs}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf"
-install %{SOURCE1}  ${CFG}/32_mod_clamav.conf
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/32_mod_clamav.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-   /etc/rc.d/init.d/httpd restart 1>&2
-else
-   echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
-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 AUTHORS ChangeLog COPYING INSTALL mod_clamav.html NEWS README TODO
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/32_mod_clamav.conf
-%attr(755,root,root) %{_libexecdir}/mod_%{mod_name}.so
+%doc AUTHORS ChangeLog mod_clamav.html NEWS README TODO
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so