SPECS: dspam.spec - config dspam server by default listen only loc...
glen
glen at pld-linux.org
Sun May 7 18:40:29 CEST 2006
Author: glen Date: Sun May 7 16:40:29 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- config dspam server by default listen only local socket
- clean ups, fixed /var permissions
---- Files affected:
SPECS:
dspam.spec (1.59 -> 1.60)
---- Diffs:
================================================================
Index: SPECS/dspam.spec
diff -u SPECS/dspam.spec:1.59 SPECS/dspam.spec:1.60
--- SPECS/dspam.spec:1.59 Sun May 7 16:25:23 2006
+++ SPECS/dspam.spec Sun May 7 18:40:23 2006
@@ -3,13 +3,16 @@
# - 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
%bcond_without pgsql # disable PostgreSQL storage driver
%bcond_without sqlite # disable SQLite3 storage driver
%bcond_without db # disable BerkeleyDB storage driver
-%bcond_without daemon # disable daemon mode
%bcond_with mysql40 # use with mysql 4.0
#
%include /usr/lib/rpm/macros.perl
@@ -17,12 +20,13 @@
Summary(pl): Biblioteka i MDA do bayesowskiego filtrowania spamu
Name: dspam
Version: 3.6.5
-Release: 0.20
+Release: 0.24
License: GPL
Group: Applications/Mail
Source0: http://www.nuclearelephant.com/projects/dspam/sources/%{name}-%{version}.tar.gz
# Source0-md5: da4f0e00633bff49d71fde418caaf14b
Patch0: %{name}-webui.patch
+Patch1: %{name}-config.patch
Source1: %{name}.init
Source2: %{name}-apache.conf
URL: http://www.nuclearelephant.com/projects/dspam/
@@ -244,6 +248,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's#\-static##g' src/Makefile* src/*/Makefile*
%{?with_mysql40:sed -i -e 's#40100#99999#g' src/mysql_drv.c}
@@ -302,14 +307,13 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/var/run/dspam,/etc/{rc.d/init.d,sysconfig}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{var/run/dspam,/etc/{rc.d/init.d,sysconfig}}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dspam
-#
ln -s /var/log/dspam $RPM_BUILD_ROOT/var/lib/%{name}/log
# install devel files
@@ -317,9 +321,7 @@
install src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
# provide maintenance scripts
-install -d $RPM_BUILD_ROOT/etc/cron.daily
-install -d $RPM_BUILD_ROOT/etc/cron.weekly
-
+install -d $RPM_BUILD_ROOT/etc/cron.{daily,weekly}
cat > $RPM_BUILD_ROOT/etc/cron.daily/%{name} <<EOF
#!/bin/sh
exec %{_bindir}/%{name}_clean -s -p
@@ -432,8 +434,10 @@
%doc README CHANGELOG RELEASE.NOTES UPGRADING
%doc doc/{courier,exim,markov,pop3filter,postfix,qmail,relay,sendmail}.txt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
-%dir %attr(750,root,mail) /var/lib/%{name}
+%dir %attr(775,root,mail) /var/run/dspam
+%dir %attr(770,root,mail) /var/lib/%{name}
%dir %attr(770,root,mail) /var/log/dspam
+%attr(754,root,root) /etc/rc.d/init.d/dspam
%attr(755,root,root) %config(noreplace) /etc/cron.daily/%{name}
%attr(755,root,root) %{_bindir}/%{name}
%attr(755,root,root) %{_bindir}/%{name}_logrotate
@@ -449,13 +453,9 @@
%attr(755,root,root) %{_bindir}/%{name}_train
%{_mandir}/man?/%{name}*
-%if %{with daemon}
-%attr(754,root,root) /etc/rc.d/init.d/dspam
%files client
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
-%attr(770,root,mail) /var/run/dspam
-%endif
%attr(755,root,root) %{_bindir}/%{name}c
%files libs
@@ -534,6 +534,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.60 2006/05/07 16:40:23 glen
+- config dspam server by default listen only local socket
+- clean ups, fixed /var permissions
+
Revision 1.59 2006/05/07 14:25:23 glen
- fix webui permissions
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.59&r2=1.60&f=u
More information about the pld-cvs-commit
mailing list