rpms/monotone/devel .cvsignore, 1.6, 1.7 README.monotone-server, 1.1, 1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.3, 1.4 monotone.spec, 1.10, 1.11 monotone.sysconfig, 1.2, 1.3 sources, 1.6, 1.7

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
+++ .cvsignore	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	13 Dec 2005 07:35:07 -0000	1.1
+++ README.monotone-server	11 Apr 2006 21:10:32 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 21:10:32 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone.init	13 Dec 2005 07:35:07 -0000	1.3
+++ monotone.init	11 Apr 2006 21:10:32 -0000	1.4
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	28 Feb 2006 18:58:17 -0000	1.10
+++ monotone.spec	11 Apr 2006 21:10:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,8 +166,9 @@
 
 
 %changelog
-* Tue Feb 28 2006 Roland McGrath <roland at redhat.com> - 0.25-3
-- Rebuilt.
+* 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.
 
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 21:10:32 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 11:34:11 -0000	1.6
+++ sources	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz