SPECS: dspam.spec - *use* sqlite3 - patched confiure.ac (patch3, thx megaba...
pawelz
pawelz at pld-linux.org
Fri Mar 6 21:06:25 CET 2009
Author: pawelz Date: Fri Mar 6 20:06:25 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- *use* sqlite3
- patched confiure.ac (patch3, thx megabajt)
- removed TODO line about autoconf problems
- unified %files (ghost so symlinks etc)
- it is enough to install README and CHANGELOG once
---- Files affected:
SPECS:
dspam.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/dspam.spec
diff -u SPECS/dspam.spec:1.73 SPECS/dspam.spec:1.74
--- SPECS/dspam.spec:1.73 Mon Dec 15 19:21:39 2008
+++ SPECS/dspam.spec Fri Mar 6 21:06:19 2009
@@ -1,7 +1,5 @@
# $Revision$, $Date$
# TODO:
-# - it does not build with new autotools. Workaround: use configure provided
-# by dspam sources
# - support for libdclassify
# - oracle driver
# - messages from default install of cron with mysql driver Memory fault
@@ -21,7 +19,7 @@
Summary(pl.UTF-8): Biblioteka i MDA do bayesowskiego filtrowania spamu
Name: dspam
Version: 3.8.0
-Release: 0.1
+Release: 1
License: GPL
Group: Applications/Mail
Source0: http://dspam.nuclearelephant.com/sources/%{name}-%{version}.tar.gz
@@ -29,6 +27,7 @@
Patch0: %{name}-webui.patch
Patch1: %{name}-config.patch
Patch2: %{name}-speedup.patch
+Patch3: %{name}-autotools.patch
Source1: %{name}.init
Source2: %{name}-apache.conf
URL: http://dspam.nuclearelephant.com/
@@ -251,6 +250,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
sed -i -e 's#\-static##g' src/Makefile* src/*/Makefile*
%{?with_mysql40:sed -i -e 's#40100#99999#g' src/mysql_drv.c}
sed -i -e 's,/usr/local/dspam/bin,/usr/bin,' ./scripts/train.pl
@@ -265,28 +265,22 @@
hash_drv
%{?with_mysql:mysql_drv}
%{?with_pgsql:pgsql_drv}
-%{?with_sqlite:sqlite_drv}
+%{?with_sqlite:sqlite3_drv}
"
%configure \
--disable-dependency-tracking \
%{?debug: --enable-debug --enable-bnr-debug --enable-verbose-debug} \
--enable-trusted-user-security \
- --enable-bias \
--enable-large-scale \
- --with-userdir=/var/lib/%{name} \
- --with-userdir-owner=none \
- --with-userdir-group=none \
--with-dspam-home=/var/lib/%{name} \
--with-dspam-home-owner=none \
--with-dspam-home-group=none \
--with-dspam-owner=none \
--with-dspam-group=none \
- --with-signature-life=14 \
--enable-ldap \
--enable-clamav \
--enable-preferences-extension \
--enable-long-usernames \
- --enable-neural-networking \
--enable-virtual-users \
--with-storage-driver=$(echo $DRIVERS | tr ' ' ',') \
%if %{with mysql}
@@ -297,9 +291,11 @@
--with-pgsql-includes=%{_includedir}/postgresql \
--with-pgsql-libraries=%{_libdir} \
%endif
+%if 0
%if %{with sqlite}
- --with-sqlite3-includes=%{_includedir} \
- --with-sqlite3-libraries=%{_libdir} \
+ --with-sqlite-includes=%{_includedir} \
+ --with-sqlite-libraries=%{_libdir} \
+%endif
%endif
--enable-daemon
@@ -398,7 +394,7 @@
%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libpgsql_drv.so,' /etc/dspam.conf
%post driver-sqlite
-%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libsqlite_drv.so,' /etc/dspam.conf
+%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libsqlite3_drv.so,' /etc/dspam.conf
%triggerin webui -- apache1 < 1.3.37-3, apache1-base
%webapp_register apache %{_webapp}
@@ -445,34 +441,37 @@
%files libs
%defattr(644,root,root,755)
-%doc README CHANGELOG
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %exclude %{_libdir}/lib*_drv*.so*
+%attr(755,root,root) %{_libdir}/libdspam.so.7.0.0
+%attr(755,root,root) %ghost %{_libdir}/libdspam.so.7
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %exclude %{_libdir}/lib*_drv*.so*
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libdspam.so
+%attr(755,root,root) %{_libdir}/lib*_drv.so
+%{_libdir}/libdspam.la
+%{_libdir}/lib*_drv.la
%{_includedir}/%{name}
-%{_mandir}/man3/libdspam*
+%{_mandir}/man3/libdspam.3*
%{_pkgconfigdir}/*.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdspam.a
+%{_libdir}/lib*_drv.a
%files driver-hash
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/css*
-%attr(755,root,root) %{_libdir}/libhash_drv*.so*
+%attr(755,root,root) %{_libdir}/libhash_drv.so.7.0.0
+%attr(755,root,root) %ghost %{_libdir}/libhash_drv.so.7
%if %{with mysql}
%files driver-mysql
%defattr(644,root,root,755)
%doc doc/mysql_drv.txt src/tools.mysql_drv/*.sql
%attr(640,root,mail) %config(noreplace) /var/lib/%{name}/mysql.data
-%attr(755,root,root) %{_libdir}/libmysql_drv*.so*
+%attr(755,root,root) %{_libdir}/libmysql_drv.so.7.0.0
+%attr(755,root,root) %ghost %{_libdir}/libmysql_drv.so.7
%endif
%if %{with pgsql}
@@ -481,14 +480,16 @@
%doc doc/pgsql_drv.txt src/tools.pgsql_drv/*.sql
%attr(640,root,mail) %config(noreplace) /var/lib/%{name}/pgsql.data
%attr(755,root,root) %{_bindir}/%{name}_pg2int8
-%attr(755,root,root) %{_libdir}/libpgsql_drv*.so*
+%attr(755,root,root) %{_libdir}/libpgsql_drv.so.7.0.0
+%attr(755,root,root) %ghost %{_libdir}/libpgsql_drv.so.7
%endif
%if %{with sqlite}
%files driver-sqlite
%defattr(644,root,root,755)
%doc doc/sqlite_drv.txt
-%attr(755,root,root) %{_libdir}/libsqlite_drv*.so*
+%attr(755,root,root) %{_libdir}/libsqlite3_drv.so.7.0.0
+%attr(755,root,root) %ghost %{_libdir}/libsqlite3_drv.so.7
%endif
%files webui
@@ -513,6 +514,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2009/03/06 20:06:19 pawelz
+- *use* sqlite3
+- patched confiure.ac (patch3, thx megabajt)
+- removed TODO line about autoconf problems
+- unified %files (ghost so symlinks etc)
+- it is enough to install README and CHANGELOG once
+
Revision 1.73 2008/12/15 18:21:39 pawelz
- added TODO line: it does not build with new autotools
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dspam.spec?r1=1.73&r2=1.74&f=u
More information about the pld-cvs-commit
mailing list