SPECS: dspam.spec - moved dspam.conf to -common subpackage. (removed TODO l...
pawelz
pawelz at pld-linux.org
Fri Mar 6 21:17:22 CET 2009
Author: pawelz Date: Fri Mar 6 20:17:22 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- moved dspam.conf to -common subpackage. (removed TODO line)
- fixed last commit log
---- Files affected:
SPECS:
dspam.spec (1.74 -> 1.75)
---- Diffs:
================================================================
Index: SPECS/dspam.spec
diff -u SPECS/dspam.spec:1.74 SPECS/dspam.spec:1.75
--- SPECS/dspam.spec:1.74 Fri Mar 6 21:06:19 2009
+++ SPECS/dspam.spec Fri Mar 6 21:17:17 2009
@@ -3,10 +3,6 @@
# - support for libdclassify
# - oracle driver
# - messages from default install of cron with mysql driver Memory fault
-# - installing dspam and dspam-client on same host causes
-# /etc/dspam.conf being owned by both packages and .rpmnew files being
-# created. move the config to -libs? -common? patch code to use
-# different config for client?
#
# Conditional build:
%bcond_without mysql # disable MySQL storage driver
@@ -44,6 +40,7 @@
%{?with_sqlite:BuildRequires: sqlite3-devel}
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-driver = %{version}-%{release}
Requires: rc-scripts
Buildroot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,10 +89,8 @@
%package client
Summary: dspam client
Summary(pl.UTF-8): Klient dspam
+Requires: %{name}-common
Group: Applications/Mail
-# to get the same dspam.conf when both installed
-Conflicts: dspam < %{version}-%{release}
-Conflicts: dspam > %{version}-%{release}
%description client
dspam client.
@@ -103,6 +98,17 @@
%description client -l pl.UTF-8
Klient dspam.
+%package common
+Summary: Common files for dspam packages
+Summary(pl.UTF-8): Wspólne pliki dla pakietów z dspamem
+Group: Applications/Mail
+
+%description common
+Common files for dspam and dspam-client packages.
+
+%description client -l pl.UTF-8
+Wspólne pliki dla pakietów dspam i dspam-client.
+
%package libs
Summary: A library for Bayesian spam filtering
Summary(pl.UTF-8): Biblioteka do bayesowskiego filtrowania spamu
@@ -413,7 +419,6 @@
%doc README CHANGELOG RELEASE.NOTES UPGRADING
%doc doc/{courier,exim,markov,pop3filter,postfix,qmail,relay,sendmail}.txt
%doc scripts/train.pl
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
%dir %attr(775,root,mail) /var/run/dspam
%dir %attr(750,root,mail) /var/lib/%{name}
%dir %attr(770,root,mail) /var/lib/%{name}/data
@@ -436,9 +441,12 @@
%files client
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
%attr(755,root,root) %{_bindir}/%{name}c
+%files common
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
+
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libdspam.so.7.0.0
@@ -514,12 +522,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.75 2009/03/06 20:17:17 pawelz
+- moved dspam.conf to -common subpackage. (removed TODO line)
+- fixed last commit 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
+- rel 1
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.74&r2=1.75&f=u
More information about the pld-cvs-commit
mailing list