rpms/monotone/F-7 .cvsignore, 1.19, 1.20 monotone.spec, 1.35, 1.36 sources, 1.19, 1.20

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
* Mon Apr 14 2008 Roland McGrath <roland at redhat.com> - 0.40-1
- Updated for 0.40 release.
- Tweaked trivia for packaging guidelines nits.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-7/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Feb 2008 02:52:35 -0000	1.19
+++ .cvsignore	14 Apr 2008 19:47:47 -0000	1.20
@@ -1 +1 @@
-monotone-0.39.tar.gz
+monotone-0.40.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-7/monotone.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- monotone.spec	26 Feb 2008 02:52:35 -0000	1.35
+++ monotone.spec	14 Apr 2008 19:47:47 -0000	1.36
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.39
+Version: 0.40
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -51,8 +51,9 @@
 Summary: Standalone server setup for monotone
 Requires: monotone = %{version}-%{release}
 Requires(pre): shadow-utils
-Requires(post): /sbin/service, /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(post): chkconfig
+Requires(preun): initscripts, chkconfig
+Requires(postun): initscripts
 Group: Development/Tools
 
 %description server
@@ -90,7 +91,8 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
-%{__install} -D -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone
+%{__install} -D -m 0555 %{SOURCE1} \
+	     %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
 %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
@@ -140,7 +142,7 @@
 %doc README.monotone-server
 %defattr(-,root,root,-)
 %{_sbindir}/monotone-server
-%{_sysconfdir}/init.d/monotone
+%{_sysconfdir}/rc.d/init.d/monotone
 %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
 %config %{_sysconfdir}/sysconfig/monotone
 %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
@@ -164,17 +166,24 @@
 # Register the monotone service
 /sbin/chkconfig --add monotone
 
-# Restart the running server, which will update its db format when needed.
-/sbin/service monotone condrestart
-
 %preun server
 if [ $1 = 0 ]; then
 	/sbin/service monotone stop > /dev/null 2>&1
 	/sbin/chkconfig --del monotone
 fi
 
+%postun
+if [ $1 -gt 1 ]; then
+	# Restart the running server: updates its db format when needed.
+	/sbin/service monotone condrestart > /dev/null 2>&1 || :
+fi
+
 
 %changelog
+* Mon Apr 14 2008 Roland McGrath <roland at redhat.com> - 0.40-1
+- Updated for 0.40 release.
+- Tweaked trivia for packaging guidelines nits.
+
 * Mon Feb 25 2008 Roland McGrath <roland at redhat.com> - 0.39-1
 - Updated for 0.39 release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-7/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Feb 2008 02:52:35 -0000	1.19
+++ sources	14 Apr 2008 19:47:47 -0000	1.20
@@ -1 +1 @@
-522c90c99e18a35c31e3dfa5f8499034  monotone-0.39.tar.gz
+4d90776beaff7445e7a2d8774378fbba  monotone-0.40.tar.gz