rpms/mailman/devel mailman-2.1.12-init-not-on.patch, NONE, 1.1 mailman.spec, 1.89, 1.90

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30354

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.12-init-not-on.patch 
Log Message:
service not on by default


mailman-2.1.12-init-not-on.patch:
 mailman.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE mailman-2.1.12-init-not-on.patch ---
diff -up mailman-2.1.12/misc/mailman.in.not-on mailman-2.1.12/misc/mailman.in
--- mailman-2.1.12/misc/mailman.in.not-on	2009-12-22 13:09:58.000000000 +0100
+++ mailman-2.1.12/misc/mailman.in	2009-12-22 13:10:28.000000000 +0100
@@ -36,8 +36,7 @@
 # Required-Start: $local_fs $remote_fs $network $named
 # Should-Start: httpd
 # Required-Stop: $local_fs $remote_fs $network
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 6
+# Default-Stop: 0 1 3 4 5 6
 # Short-Description: start and stop Mailman
 # Description: Mailman is the GNU mailing list manager.
 ### END INIT INFO


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- mailman.spec	14 Oct 2009 11:16:49 -0000	1.89
+++ mailman.spec	22 Dec 2009 12:54:04 -0000	1.90
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -34,6 +34,8 @@ Patch16: mailman-2.1.12-privurl.patch
 Patch17: mailman-2.1.12-mmcfg.patch
 Patch18: mailman-2.1.12-initcleanup.patch
 Patch19: mailman-2.1.12-codage.patch
+# the service is now off by default
+Patch20: mailman-2.1.12-init-not-on.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -122,6 +124,7 @@ additional installation steps, these are
 %patch17 -p1 -b .mmcfg
 %patch18 -p1 -b .initcleanup
 %patch19 -p1
+%patch20 -p1
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -294,6 +297,9 @@ fi
 # shouldn't silently stop the service, so if mailman was running
 # we'll leave a temp file in the lock directory as a flag so in
 # the post install phase we can restart it.
+#
+# rpmlint will complain here about "dangerous use of rm"
+# but this is OK because we are only rm-ing our temporary file
 if [ -d %{lockdir} ]; then
   rm -f %{restart_flag}
   /sbin/service %{name} status >/dev/null 2>&1
@@ -354,6 +360,10 @@ exit 0
 %{mmdir}/messages
 %{mmdir}/pythonlib
 %{mmdir}/scripts
+# rpmlint will complain here about config files being in /usr
+# but these are both data files -parts of mailman's web UI-
+# and config files - user can change them to match the design
+# and/or content of their web pages
 %config(noreplace) %{mmdir}/templates
 %{mmdir}/tests
 %{varmmdir}
@@ -489,6 +499,9 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Tue Dec 22 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-13
+- the service is now not on by default (change for merge review, #226117)
+
 * Wed Oct 14 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-12
 - fix the last patch (bz#528492), no space between "coding" and ":"