rpms/monotone/devel .cvsignore, 1.8, 1.9 monotone.init, 1.5, 1.6 monotone.spec, 1.13, 1.14 sources, 1.8, 1.9
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Thu Aug 3 20:28:49 UTC 2006
- Previous message (by thread): rpms/monotone/FC-4 .cvsignore, 1.8, 1.9 monotone.init, 1.8, 1.9 monotone.spec, 1.17, 1.18 sources, 1.8, 1.9
- Next message (by thread): rpms/monotone/FC-5 monotone.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: roland
Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19261
Modified Files:
.cvsignore monotone.init monotone.spec sources
Log Message:
Update to 0.28
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 12 Jul 2006 07:07:51 -0000 1.8
+++ .cvsignore 3 Aug 2006 20:28:49 -0000 1.9
@@ -1 +1 @@
-monotone-0.27.tar.gz
+monotone-0.28.tar.gz
Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monotone.init 8 May 2006 19:50:21 -0000 1.5
+++ monotone.init 3 Aug 2006 20:28:49 -0000 1.6
@@ -5,7 +5,7 @@
# chkconfig: - 90 10
# description: Monotone netsync protocol server
# processname: monotone-server
-# pidfile: /var/run/monotone-server.pid
+# pidfile: /var/run/monotone/monotone-server.pid
# config: /etc/sysconfig/monotone
# config: /etc/monotone/monotonerc
@@ -26,6 +26,7 @@
MT=/usr/bin/mtn
MTSERVER=/usr/sbin/monotone-server
+MONOTONE_PIDFILE=/var/run/monotone/monotone-server.pid
MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
MONOTONE_OLDDB=/var/db/monotone/server.db
@@ -62,10 +63,12 @@
{
exec 3>> $MONOTONE_LOGFILE &&
echo >&3 "Server restart at `date`" &&
- daemon --user=${MONOTONE_USER:-monotone} $MTSERVER \
- $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS \
- serve --pid-file=/var/run/monotone-server.pid \
- "$MONOTONE_SERVE_OPTS" ">&3 2>&3 &"
+ daemon --user=${MONOTONE_USER:-monotone} \
+ --pidfile $MONOTONE_PIDFILE \
+ $MTSERVER \
+ $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS \
+ serve --pid-file=$MONOTONE_PIDFILE \
+ "$MONOTONE_SERVE_OPTS" ">&3 2>&3 &"
} && success || failure
RETVAL=$?
echo
@@ -75,7 +78,7 @@
stop)
# Stop daemons.
echo -n $"Stopping monotone server: "
- killproc $MTSERVER
+ killproc -p $MONOTONE_PIDFILE $MTSERVER
RETVAL=$?
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone
echo
@@ -88,7 +91,7 @@
[ -e /var/lock/subsys/monotone ] && $0 restart
;;
status)
- status monotone-server
+ status -p $MONOTONE_PIDFILE monotone-server
RETVAL=$?
;;
init)
Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- monotone.spec 12 Jul 2006 07:07:51 -0000 1.13
+++ monotone.spec 3 Aug 2006 20:28:49 -0000 1.14
@@ -1,5 +1,5 @@
Name: monotone
-Version: 0.27
+Version: 0.28
Release: 1%{?dist}
Summary: A free, distributed version control system
@@ -81,22 +81,23 @@
emacs -batch -f batch-byte-compile ${lispdir}
mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}/etc/init.d
-mkdir -p %{buildroot}/etc/sysconfig
-mkdir -p %{buildroot}/var/db
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_localstatedir}/db
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
-%{__install} -d -m 0750 %{buildroot}/etc/monotone/private-keys
-%{__install} -d -m 0770 %{buildroot}/var/db/monotone
+%{__install} -c -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone
+%{__install} -c -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
+%{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
+%{__install} -d -m 0770 %{buildroot}%{_localstatedir}/db/monotone
+%{__install} -d -m 0755 %{buildroot}%{_localstatedir}/run/monotone
# These do not actually wind up in the package, due to %%ghost.
-%{__install} -c -m 0440 /dev/null %{buildroot}/etc/monotone/passphrase.lua
-%{__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.mtn
+%{__install} -c -m 0440 /dev/null %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
+%{__install} -c -m 0640 /dev/null %{buildroot}%{_sysconfdir}/monotone/read-permissions
+%{__install} -c -m 0640 /dev/null %{buildroot}%{_sysconfdir}/monotone/write-permissions
+%{__install} -c -m 0644 /dev/null %{buildroot}%{_sysconfdir}/monotone/monotonerc
+touch %{buildroot}%{_localstatedir}/db/monotone/server.mtn
cp %{SOURCE3} .
@@ -131,21 +132,22 @@
%doc README.monotone-server
%defattr(-,root,root,-)
%{_sbindir}/monotone-server
-/etc/init.d/monotone
-%config /etc/sysconfig/monotone
-%dir %attr(0755,root,monotone) /etc/monotone
-%dir %attr(0750,root,monotone) /etc/monotone/private-keys
-%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/monotonerc
-%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
-%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.mtn
+%{_sysconfdir}/init.d/monotone
+%dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
+%config %{_sysconfdir}/sysconfig/monotone
+%dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
+%dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
+%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/passphrase.lua
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/read-permissions
+%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/write-permissions
+%dir %attr(0770,monotone,monotone) %{_localstatedir}/db/monotone
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/db/monotone/server.mtn
%pre server
# Add the "monotone" user
/usr/sbin/useradd -c "Monotone Netsync Server" \
- -s /sbin/nologin -r -d /var/db/monotone monotone 2> /dev/null || :
+ -s /sbin/nologin -r -d %{_localstatedir}/db/monotone monotone 2> /dev/null || :
%post server
# Register the monotone service
@@ -162,6 +164,10 @@
%changelog
+* Thu Aug 3 2006 Roland McGrath <roland at redhat.com> - 0.28-1
+- Updated for 0.28 release. (#198652)
+- Move server PID file into /var/run/monotone subdirectory. (#198761)
+
* Tue Jul 11 2006 Roland McGrath <roland at redhat.com> - 0.27-1
- Updated for 0.27 release.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 12 Jul 2006 07:07:51 -0000 1.8
+++ sources 3 Aug 2006 20:28:49 -0000 1.9
@@ -1 +1 @@
-cf3d8f26b7570d0d65834c3949913e2d monotone-0.27.tar.gz
+8c2e81152e12fed543a8702792232ed3 monotone-0.28.tar.gz
- Previous message (by thread): rpms/monotone/FC-4 .cvsignore, 1.8, 1.9 monotone.init, 1.8, 1.9 monotone.spec, 1.17, 1.18 sources, 1.8, 1.9
- Next message (by thread): rpms/monotone/FC-5 monotone.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list