rpms/monotone/F-8 .cvsignore, 1.16, 1.17 monotone.init, 1.11, 1.12 monotone.spec, 1.30, 1.31 sources, 1.16, 1.17

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/monotone/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6266/F-8

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Log Message:
Update to 0.37


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Aug 2007 11:06:18 -0000	1.16
+++ .cvsignore	28 Oct 2007 04:35:56 -0000	1.17
@@ -1 +1 @@
-monotone-0.36.tar.gz
+monotone-0.37.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/monotone.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monotone.init	3 Aug 2007 11:06:18 -0000	1.11
+++ monotone.init	28 Oct 2007 04:35:56 -0000	1.12
@@ -8,6 +8,20 @@
 # pidfile: /var/run/monotone/monotone-server.pid
 # config: /etc/sysconfig/monotone
 # config: /etc/monotone/monotonerc
+#
+### BEGIN INIT INFO
+# Provides: monotone
+# Required-Start: $local_fs $network $named $time
+# Required-Stop: $local_fs $network
+# Short-Description: start and stop Monotone netsync protocol server
+# Description: Monotone is a free, distributed version control system.
+#  It provides fully disconnected operation, manages complete
+#  tree versions, keeps its state in a local transactional
+#  database, supports overlapping branches and extensible
+#  metadata, exchanges work over plain network protocols,
+#  performs history-sensitive merging, and delegates trust
+#  functions to client-side RSA certificates.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -95,7 +109,7 @@
         [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
         echo
         ;;
-  restart)
+  restart|force-reload)
         $0 stop
         $0 start
         ;;
@@ -122,6 +136,12 @@
   genkey)
 	MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}}
 	MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua}
+	if [ -s "$MONOTONE_PPFILE" -a -s "$MONOTONE_DBFILE" ]
+	then
+		echo >&2 "$0:" $"Server key already installed"
+		echo >&2 "$0:" $"To lose old key remove file" "$MONOTONE_PPFILE"
+		exit 1
+	fi
 	echo -n $"Generating RSA key for server $MONOTONE_KEYID"
 	tmp=/tmp/mtserver$$
 	if


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/monotone.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- monotone.spec	28 Aug 2007 07:39:05 -0000	1.30
+++ monotone.spec	28 Oct 2007 04:35:56 -0000	1.31
@@ -1,11 +1,7 @@
 Name: monotone
-Version: 0.36
+Version: 0.37
 Release: 2%{?dist}
 
-# XXX temporary pending bug fix for miscompilation(?) on ppc
-# See https://bugzilla.redhat.com/show_bug.cgi?id=259161
-ExcludeArch: ppc ppc64
-
 Summary: A free, distributed version control system
 Group: Development/Tools
 License: GPL
@@ -175,6 +171,11 @@
 
 
 %changelog
+* Sat Oct 27 2007 Roland McGrath <roland at redhat.com> - 0.37-2
+- Updated for 0.37 release.
+- Prevent destroying old passphrase file with 'service monotone genkey'.
+- Put LSB standard comments in monotone.init for monotone-server subpackage.
+
 * Tue Aug 28 2007 Roland McGrath <roland at redhat.com> - 0.36-2
 - Clean up %%pre script per packaging guidelines.
 - Disable ppc and ppc64 builds temporarily since make check fails. (#259161)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Aug 2007 11:06:18 -0000	1.16
+++ sources	28 Oct 2007 04:35:56 -0000	1.17
@@ -1 +1 @@
-ba6733ebd9992c8c7b48b9e2226f9fb7  monotone-0.36.tar.gz
+d06193f2738626570692bed2173144c1  monotone-0.37.tar.gz