- unified

Changed files:
    apache-mod_clamav.spec -> 1.11

diff --git a/apache-mod_clamav.spec b/apache-mod_clamav.spec
index c7024c0dd329f4b1353263e72460f6cdbb1bee02..1c2ab3d00eaa94ac1d8eb00630f40029024105d1 100644 (file)
--- a/apache-mod_clamav.spec
+++ b/apache-mod_clamav.spec
@@ -1,10 +1,12 @@
+# 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):   Filtr skanera antywirusowego dla Apache'a
 Name:          apache-mod_%{mod_name}
 Version:       0.21
-Release:       1
+Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://software.othello.ch/mod_clamav/mod_%{mod_name}-%{version}.tar.gz
@@ -14,20 +16,19 @@ Patch0:             %{name}-libtool-tag.patch
 URL:           http://software.othello.ch/mod_clamav/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
-BuildRequires: apr-devel
-BuildRequires: apr-util-devel
+BuildRequires: apr-devel >= 1:1.0
+BuildRequires: apr-util-devel >= 1:1.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: clamav-devel
 BuildRequires: libtool
-Requires:      apache >= 2
+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     %(%{apxs} -q SYSCONFDIR)
-%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
@@ -43,18 +44,15 @@ skanera antywirusowego Clamav.
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p0
 
-%{__perl} -pi -e 's/(-module)/$1 -avoid-version/' Makefile.am
-
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 
-CPPFLAGS="-I `/usr/bin/apr-config --includedir` -I `/usr/bin/apu-config --includedir`"
+CPPFLAGS="-I `/usr/bin/apr-1-config --includedir` -I `/usr/bin/apu-1-config --includedir`"
 %configure \
        --with-apxs=%{apxs}
-
 %{__make}
 
 %install
@@ -62,9 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf"
-install %{SOURCE1} ${CFG}/32_mod_clamav.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/32_mod_clamav.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,8 +68,6 @@ 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
 
 %preun
@@ -86,5 +80,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog mod_clamav.html NEWS README TODO
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/32_mod_clamav.conf
-%attr(755,root,root) %{_libexecdir}/mod_%{mod_name}.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*