- up to 0.4.5

diff --git a/c-icap-modules-build.patch b/c-icap-modules-build.patch
index 830a8aeb1b6eae10633d179efc7d73b00b269622..1a5688c9b10f7a392da420f4ed337ab08c91dc22 100644 (file)
--- a/c-icap-modules-build.patch
+++ b/c-icap-modules-build.patch
@@ -1,12 +1,12 @@
-diff -ur c_icap_modules-0.1.3.orig/configure.in c_icap_modules-0.1.3.mod/configure.in
---- c_icap_modules-0.1.3.orig/configure.in     2010-12-21 20:30:23.000000000 +0100
-+++ c_icap_modules-0.1.3.mod/configure.in      2011-03-18 15:52:47.844674361 +0100
+diff -ur c_icap_modules-0.1.3.orig/configure.ac c_icap_modules-0.1.3.mod/configure.ac
+--- c_icap_modules-0.1.3.orig/configure.ac     2010-12-21 20:30:23.000000000 +0100
++++ c_icap_modules-0.1.3.mod/configure.ac      2011-03-18 15:52:47.844674361 +0100
 @@ -43,7 +43,7 @@
  )
  
  if test -z "$cicapdir"; then
 -    if c-icap-config >& /dev/null; then
-+    if c-icap-config > /dev/null; then
++    if c-icap-config >/dev/null; then
          cicapflags=`c-icap-config --cflags`
          cicaplibs=`c-icap-config --libs` 
          cicapetc=`c-icap-config --configdir`

diff --git a/c-icap-modules.spec b/c-icap-modules.spec
index 8e11b4e3aa09e145cf13b920fdbfd9d3404e0559..3e3c72cca53f762d4b99c126b33f534c448c6a87 100644 (file)
--- a/c-icap-modules.spec
+++ b/c-icap-modules.spec
@@ -1,14 +1,18 @@
-#
 Summary:       Modules for c-icap ICAP server
 Name:          c-icap-modules
-Version:       0.1.3
-Release:       0.1
+Version:       0.4.5
+Release:       1
 License:       BSD
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/c-icap/c_icap_modules-%{version}.tar.gz
-# Source0-md5: e1ced11a487495d621c2db3a11a5262f
+Group:         Networking/Daemons
+Source0:       http://downloads.sourceforge.net/c-icap/c_icap_modules-%{version}.tar.gz
+# Source0-md5: 1a7eaa7a34ff35c2440cf303f7b45f22
 Patch0:                %{name}-build.patch
 URL:           http://c-icap.sourceforge.net/
+BuildRequires: bzip2-devel
+BuildRequires: c-icap-devel
+BuildRequires: clamav-devel
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -17,24 +21,29 @@ Modules for c-icap ICAP server
 %package -n c-icap-srv_clamav
 Summary:       ClamAV service for c-icap
 Group:         Development/Libraries
+Group:         Networking/Daemons
 Requires:      c-icap
 
 %description -n c-icap-srv_clamav
 ClamAV service for c-icap.
 
-%description -n c-icap-srv_clamav -l pl.UTF-8
-ClamAV service for c-icap.
-
 %package -n c-icap-srv_url_check
 Summary:       URL check service for c-icap
 Group:         Development/Libraries
+Group:         Networking/Daemons
 Requires:      c-icap
 
 %description -n c-icap-srv_url_check
 URL check service for c-icap.
 
-%description -n c-icap-srv_url_check -l pl.UTF-8
-URL check service for c-icap.
+%package -n c-icap-srv_content_filtering
+Summary:       Content filtering service for c-icap
+Group:         Libraries
+Group:         Networking/Daemons
+Requires:      c-icap
+
+%description -n c-icap-srv_content_filtering
+Content filtering service for c-icap.
 
 %prep
 %setup -q -n c_icap_modules-%{version}
@@ -43,6 +52,7 @@ URL check service for c-icap.
 %build
 %{__autoconf}
 %configure
+
 %{__make}
 
 %install
@@ -52,15 +62,40 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/c-icap
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# Not installed by upstream
+cp -a services/content_filtering/srv_content_filtering.conf.default \
+       $RPM_BUILD_ROOT%{_sysconfdir}/c-icap/srv_content_filtering.conf
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/c_icap/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -n c-icap-srv_clamav
 %defattr(644,root,root,755)
-%attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/srv_clamav.conf
-%attr(755,root,root) %{_libdir}/c_icap/srv_clamav.so
+%attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/clamav_mod.conf
+%attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/clamd_mod.conf
+%attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/virus_scan.conf
+%{_sysconfdir}/c-icap/clamav_mod.conf.default
+%{_sysconfdir}/c-icap/clamd_mod.conf.default
+%{_sysconfdir}/c-icap/virus_scan.conf.default
+%attr(755,root,root) %{_libdir}/c_icap/clamav_mod.so
+%attr(755,root,root) %{_libdir}/c_icap/clamd_mod.so
+%attr(755,root,root) %{_libdir}/c_icap/virus_scan.so
+%{_datadir}/c_icap/templates/virus_scan
 
 %files -n c-icap-srv_url_check
 %defattr(644,root,root,755)
 %attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/srv_url_check.conf
+%{_sysconfdir}/c-icap/srv_url_check.conf.default
 %attr(755,root,root) %{_libdir}/c_icap/srv_url_check.so
+%{_datadir}/c_icap/templates/srv_url_check
+%{_bindir}/c-icap-mods-sguardDB
+%{_mandir}/man8/c-icap-mods-sguardDB.8*
+
+%files -n c-icap-srv_content_filtering
+%defattr(644,root,root,755)
+%attr(640,root,c-icap) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/c-icap/srv_content_filtering.conf
+%{_sysconfdir}/c-icap/srv_content_filtering.conf.default
+%attr(755,root,root) %{_libdir}/c_icap/srv_content_filtering.so
+%{_datadir}/c_icap/templates/srv_content_filtering