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

[Roland McGrath (roland)]

Author: roland

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Aug 2007 11:08:18 -0000	1.16
+++ .cvsignore	27 Oct 2007 01:41:43 -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-7/monotone.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monotone.init	3 Aug 2007 11:02:39 -0000	1.11
+++ monotone.init	27 Oct 2007 01:41:43 -0000	1.12
@@ -122,6 +122,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-7/monotone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- monotone.spec	28 Aug 2007 07:39:02 -0000	1.29
+++ monotone.spec	27 Oct 2007 01:41:43 -0000	1.30
@@ -1,10 +1,6 @@
 Name: monotone
-Version: 0.36
-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
+Version: 0.37
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -175,6 +171,10 @@
 
 
 %changelog
+* Fri Oct 26 2007 Roland McGrath <roland at redhat.com> - 0.37-1
+- Updated for 0.37 release.
+- Prevent destroying old passphrase file with 'service monotone genkey'.
+
 * 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-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	3 Aug 2007 11:08:18 -0000	1.16
+++ sources	27 Oct 2007 01:41:43 -0000	1.17
@@ -1 +1 @@
-ba6733ebd9992c8c7b48b9e2226f9fb7  monotone-0.36.tar.gz
+d06193f2738626570692bed2173144c1  monotone-0.37.tar.gz