rpms/spamass-milter/FC-3 spamass-milter.spec, 1.5, 1.6 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/spamass-milter/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30858

Modified Files:
	spamass-milter.spec sources .cvsignore 
Log Message:
resync with devel



Index: spamass-milter.spec
===================================================================
RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spamass-milter.spec	7 Aug 2005 10:28:40 -0000	1.5
+++ spamass-milter.spec	6 Apr 2006 13:14:39 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:        Sendmail milter for spamassassin
 Name:           spamass-milter
-Version:        0.3.0
-Release:        8%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://savannah.nongnu.org/projects/spamass-milt/
@@ -13,7 +13,7 @@
 BuildRequires:  spamassassin, sendmail-devel
 Requires:       spamassassin, sendmail
 
-Requires(pre):  %{_sbindir}/useradd
+Requires(pre):  /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %{__cp} %{SOURCE1} .
-%{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:/var/run/spamass-milter/spamass-milter.sock@' README
+%{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:%{_localstatedir}/run/spamass-milter/spamass-milter.sock@' README
 
 %{__cat} <<EOF >spamass-milter.sysconfig
 ### Override for your different local config
@@ -133,7 +133,7 @@
 EOF
 
 %build
-export SENDMAIL=%{_sbindir}/sendmail
+export SENDMAIL=/usr/sbin/sendmail
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -147,7 +147,7 @@
 %{__install}    -m0755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
 
 %pre
-%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \
+/usr/sbin/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \
 	-c "SpamAssassin Milter" sa-milt &>/dev/null || :
 
 %post
@@ -176,6 +176,12 @@
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter
 
 %changelog
+* Thu Apr  6 2006 Paul Howarth <paul at city-fan.org> - 0.3.1-1
+- Update to 0.3.1
+
+* Wed Feb 16 2006 Paul Howarth <paul at city-fan.org> - 0.3.0-9
+- Don't use macros in command paths, hardcode them instead
+
 * Mon Aug  1 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-8
 - Run the milter in a wrapper script that restarts it if it scrashes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spamass-milter/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jun 2005 09:13:56 -0000	1.2
+++ sources	6 Apr 2006 13:14:39 -0000	1.3
@@ -1 +1 @@
-ced600331a0df7609fdbdf0e6d0eb943  spamass-milter-0.3.0.tar.gz
+ca6bf6a9c88db74a6bfea41f499c0ba6  spamass-milter-0.3.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spamass-milter/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Jun 2005 09:13:56 -0000	1.2
+++ .cvsignore	6 Apr 2006 13:14:39 -0000	1.3
@@ -1 +1 @@
-spamass-milter-0.3.0.tar.gz
+spamass-milter-0.3.1.tar.gz