rpms/monotone/devel monotone.init,1.4,1.5 monotone.spec,1.11,1.12

[Roland McGrath (roland)]

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12684

Modified Files:
	monotone.init monotone.spec 
Log Message:
Fix service script genkey subcommand.


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monotone.init	11 Apr 2006 21:10:32 -0000	1.4
+++ monotone.init	8 May 2006 19:50:21 -0000	1.5
@@ -112,9 +112,10 @@
 	if
 		passphrase=`random_passphrase` &&
 		{ echo $passphrase; echo $passphrase; } |
-		runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c \
-			"$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \
- 			genkey $MONOTONE_KEYID" > /dev/null 2>&1 &&
+		(umask 027; $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \
+				genkey $MONOTONE_KEYID > /dev/null 2>&1) &&
+		/bin/chgrp ${MONOTONE_GROUP:-monotone} \
+			   "$MONOTONE_KEYDIR/$MONOTONE_KEYID" &&
 		cat > $tmp <<EOF &&
 function get_passphrase(keyid)
   return "$passphrase"


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monotone.spec	11 Apr 2006 21:10:32 -0000	1.11
+++ monotone.spec	8 May 2006 19:50:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Mon May  8 2006 Roland McGrath <roland at redhat.com> - 0.26-2
+- Fix service script genkey subcommand.
+
 * Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
 - Updated for 0.25 release.
   - Major changes; see UPGRADE doc file for details.