rpms/spamassassin/devel sa-update.cronscript, 1.7, 1.8 spamassassin.spec, 1.149, 1.150

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31607

Modified Files:
	sa-update.cronscript spamassassin.spec 
Log Message:
minor cleanups, rename conf dir to /etc/mail/spamassassin/channel.d/



Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sa-update.cronscript,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sa-update.cronscript	29 Dec 2009 03:18:04 -0000	1.7
+++ sa-update.cronscript	11 Jan 2010 22:51:02 -0000	1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # *** DO NOT MODIFY THIS FILE ***
 #
-# /etc/mail/spamassassin/channels/*.conf
+# /etc/mail/spamassassin/channel.d/*.conf
 #     Place files here to add custom channels.
 #
 
@@ -46,8 +46,8 @@ fi
 # Initialize Channels and Keys
 CHANNELLIST=""
 KEYLIST=""
-# Process each channel defined in /etc/mail/spamassassin/channels/
-for file in $(run_parts_list /etc/mail/spamassassin/channels/ .conf); do 
+# Process each channel defined in /etc/mail/spamassassin/channel.d/
+for file in $(run_parts_list /etc/mail/spamassassin/channel.d/ .conf); do 
     # Validate config file
     PREFIXES="CHANNELURL KEYID BEGIN"
     for prefix in $PREFIXES; do
@@ -57,8 +57,8 @@ for file in $(run_parts_list /etc/mail/s
         fi
     done
     . $file
-    echo "CHANNELURL=$CHANNELURL"
-    echo "KEYID=$KEYID"
+    #echo "CHANNELURL=$CHANNELURL"
+    #echo "KEYID=$KEYID"
     CHANNELLIST="$CHANNELLIST $CHANNELURL"
     KEYLIST="$KEYLIST $KEYID"
     sa-update --import $file


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- spamassassin.spec	11 Jan 2010 19:40:03 -0000	1.149
+++ spamassassin.spec	11 Jan 2010 22:51:02 -0000	1.150
@@ -52,7 +52,7 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename rc2
-Release: 0.30.%{prename}%{?dist}
+Release: 0.31.%{prename}%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -201,9 +201,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 
 # sa-update channels and keyring directory
 mkdir   -m 0700             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
-mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
-install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
-install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/
+mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
+install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
 
 # Tell portreserve which port we want it to protect.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
@@ -261,11 +261,11 @@ fi
 exit 0
 
 %changelog
-* Mon Jan 11 2010 Warren Togami <wtogami at redhat.com> - 3.3.0-0.30-rc2
+* Mon Jan 11 2010 Warren Togami <wtogami at redhat.com> - 3.3.0-0.31-rc2
 - 3.3.0-rc2
 
 * Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.29.rc1
-- sa-update channels defined in /etc/mail/spamassassin/channels/*.conf
+- sa-update channels defined in /etc/mail/spamassassin/channel.d/*.conf files
 
 * Mon Dec 28 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.27.rc1
 - sa-update runs in cron automatically if spamd or amavisd is running
@@ -274,10 +274,6 @@ exit 0
 * Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
 - 3.3.0-rc1.proposed2 with fixed spamc
 
-* Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
-- Revert to beta1 to fix major error where spamc does nothing and mail
-  is lost into black hole.
-
 * Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
 - 3.3.0-rc1
 - Bug #103401: portreserve protect spamd port 783 on F-10+