SPECS: apache-mod_clamav.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:26:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_clamav.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_clamav.spec
diff -u SPECS/apache-mod_clamav.spec:1.10 SPECS/apache-mod_clamav.spec:1.11
--- SPECS/apache-mod_clamav.spec:1.10	Mon Dec 12 14:44:44 2005
+++ SPECS/apache-mod_clamav.spec	Mon Dec 26 20:26:04 2005
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
+# 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
@@ -15,20 +17,19 @@
 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
@@ -44,18 +45,15 @@
 %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
@@ -63,9 +61,7 @@
 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
@@ -73,8 +69,6 @@
 %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
@@ -87,8 +81,8 @@
 %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}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/12/26 19:26:04  glen
+- unified
+
 Revision 1.10  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_clamav.spec?r1=1.10&r2=1.11&f=u