SPECS: dspam.spec - drop unused /var/lib/%{name}/log symlink - pac...

glen glen at pld-linux.org
Sun May 7 19:55:44 CEST 2006


Author: glen                         Date: Sun May  7 17:55:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop unused /var/lib/%{name}/log symlink
- package /var/lib/%{name}/data and make it's parent not writable
- add scripts/train.pl to %doc
- cleanups

---- Files affected:
SPECS:
   dspam.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/dspam.spec
diff -u SPECS/dspam.spec:1.60 SPECS/dspam.spec:1.61
--- SPECS/dspam.spec:1.60	Sun May  7 18:40:23 2006
+++ SPECS/dspam.spec	Sun May  7 19:55:39 2006
@@ -20,7 +20,7 @@
 Summary(pl):	Biblioteka i MDA do bayesowskiego filtrowania spamu
 Name:		dspam
 Version:	3.6.5
-Release:	0.24
+Release:	0.25
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.nuclearelephant.com/projects/dspam/sources/%{name}-%{version}.tar.gz
@@ -251,6 +251,7 @@
 %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}
+sed -i -e 's,/usr/local/dspam/bin,/usr/bin,' ./scripts/train.pl
 
 %build
 %{__libtoolize}
@@ -307,15 +308,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/run/dspam,/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{/var/run/dspam,/etc/{rc.d/init.d,sysconfig}} \
+	$RPM_BUILD_ROOT/var/lib/%{name}/data
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 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
 install -d $RPM_BUILD_ROOT{%{_includedir}/%{name},/var/{log,lib}/%{name}}
 install src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -336,8 +336,6 @@
 #install dspam-cron.weekly $RPM_BUILD_ROOT%{_sysconfdir}/cron.weekly/%{name}
 
 %if %{with mysql}
-# fix missing file
-install -d $RPM_BUILD_ROOT/var/lib/%{name}
 cat > $RPM_BUILD_ROOT/var/lib/%{name}/mysql.data <<EOF
 _UNCONFIGURED_
 
@@ -354,8 +352,6 @@
 %endif
 
 %if %{with pgsql}
-# fix missing file
-install -d $RPM_BUILD_ROOT/var/lib/%{name}
 cat > $RPM_BUILD_ROOT/var/lib/%{name}/pgsql.data <<EOF
 _UNCONFIGURED_
 
@@ -433,9 +429,11 @@
 %defattr(644,root,root,755)
 %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(770,root,mail) /var/lib/%{name}
+%dir %attr(750,root,mail) /var/lib/%{name}
+%dir %attr(770,root,mail) /var/lib/%{name}/data
 %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}
@@ -534,6 +532,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2006/05/07 17:55:39  glen
+- drop unused /var/lib/%{name}/log symlink
+- package /var/lib/%{name}/data and make it's parent not writable
+- add scripts/train.pl to %doc
+- cleanups
+
 Revision 1.60  2006/05/07 16:40:23  glen
 - config dspam server by default listen only local socket
 - clean ups, fixed /var permissions
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.60&r2=1.61&f=u



More information about the pld-cvs-commit mailing list