rpms/monotone/FC-6 .cvsignore, 1.15, 1.16 monotone.init, 1.10, 1.11 monotone.spec, 1.26, 1.27 sources, 1.15, 1.16 monotone-0.35-parallel-tests.patch, 1.1, NONE

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/monotone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8997

Modified Files:
	.cvsignore monotone.init monotone.spec sources 
Removed Files:
	monotone-0.35-parallel-tests.patch 
Log Message:
New upstream version 0.36


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 May 2007 01:39:44 -0000	1.15
+++ .cvsignore	3 Aug 2007 11:09:43 -0000	1.16
@@ -1 +1 @@
-monotone-0.35.tar.gz
+monotone-0.36.tar.gz


Index: monotone.init
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/FC-6/monotone.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.init	17 May 2007 00:22:46 -0000	1.10
+++ monotone.init	3 Aug 2007 11:09:43 -0000	1.11
@@ -99,7 +99,7 @@
         $0 stop
         $0 start
         ;;
-  condrestart)
+  condrestart|try-restart)
        [ -e /var/lock/subsys/monotone ] && $0 restart
        ;;
   status)
@@ -131,6 +131,7 @@
 				genkey $MONOTONE_KEYID > /dev/null 2>&1) &&
 		/bin/chgrp ${MONOTONE_GROUP:-monotone} \
 			   "$MONOTONE_KEYDIR/$MONOTONE_KEYID" &&
+		/bin/chmod 0640 "$MONOTONE_KEYDIR/$MONOTONE_KEYID" &&
 		cat > $tmp <<EOF &&
 function get_passphrase(keyid)
   return "$passphrase"


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/FC-6/monotone.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- monotone.spec	17 May 2007 00:22:46 -0000	1.26
+++ monotone.spec	3 Aug 2007 11:09:43 -0000	1.27
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.35
-Release: 3%{?dist}
+Version: 0.36
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,8 +12,6 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
-Patch1: monotone-0.35-parallel-tests.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -38,7 +36,7 @@
 BuildRequires: emacs
 
 Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 monotone is a free, distributed version control system.
@@ -52,6 +50,9 @@
 %package server
 Summary: Standalone server setup for monotone
 Requires: monotone = %{version}-%{release}
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/service, /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
 Group: Development/Tools
 
 %description server
@@ -60,7 +61,6 @@
 
 %prep
 %setup -q
-%patch1 -p0
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -116,7 +116,7 @@
 	/sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
-%postun
+%preun
 if [ $1 -eq 0 ]
 then
 	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
@@ -168,6 +168,12 @@
 
 
 %changelog
+* Fri Aug  3 2007 Roland McGrath <roland at redhat.com> - 0.36-1
+- Updated for 0.36 release.
+
+* Fri Jul 06 2007 Florian La Roche <laroche at redhat.com> - 0.35-4
+- add more requires
+
 * Wed May 16 2007 Roland McGrath <roland at redhat.com> - 0.35-3
 - Fix locale dependency in monotone-server init script. (#213893)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 May 2007 01:39:44 -0000	1.15
+++ sources	3 Aug 2007 11:09:43 -0000	1.16
@@ -1 +1 @@
-9b53046dda8ba7549fa5ce765e14fa65  monotone-0.35.tar.gz
+ba6733ebd9992c8c7b48b9e2226f9fb7  monotone-0.36.tar.gz


--- monotone-0.35-parallel-tests.patch DELETED ---