extras-buildsys ChangeLog,1.51,1.52 plague.spec,1.15,1.16

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781

Modified Files:
	ChangeLog plague.spec 
Log Message:
2005-07-10  Dan Williams <dcbw at redhat.com>

    Patch from Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
    * Add initscript/daemon support for the server




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	10 Jul 2005 19:59:32 -0000	1.51
+++ ChangeLog	11 Jul 2005 03:23:21 -0000	1.52
@@ -1,5 +1,10 @@
 2005-07-10  Dan Williams <dcbw at redhat.com>
 
+    Patch from Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
+    * Add initscript/daemon support for the server
+
+2005-07-10  Dan Williams <dcbw at redhat.com>
+
     * server/PackageJob.py
       server/BuildMaster.py
         - Reduce total threadcount by breaking PackageJob runs into


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plague.spec	11 Jul 2005 02:26:05 -0000	1.15
+++ plague.spec	11 Jul 2005 03:23:21 -0000	1.16
@@ -12,6 +12,10 @@
 Requires: python-sqlite, pyOpenSSL, createrepo
 Requires: %{name}-common = %{version}-%{release}
 Requires: lighttpd
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 
 %description
 The Plague build system is a client/server distributed build system for
@@ -34,6 +38,7 @@
 Requires: yum >= 2.2.1
 Requires: mock >= 0.3, pyOpenSSL
 Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
@@ -75,14 +80,27 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
 install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+/sbin/chkconfig --add plague-server
+/sbin/service plague-server condrestart >> /dev/null || :
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/service plague-server stop &> /dev/null
+  /sbin/chkconfig --del plague-server
+fi
+
 %post builder
 /sbin/chkconfig --add plague-builder
+/sbin/service plague-builder condrestart >> /dev/null || :
 . %{_sysconfdir}/sysconfig/%{name}-builder
 if [ -z "$ARCHSOPT" ] ; then
   sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder
@@ -105,6 +123,8 @@
 %dir %{_sysconfdir}/%{name}/server/certs
 %dir %{_sysconfdir}/%{name}/server/addl_pkg_arches
 %{_sysconfdir}/%{name}/server/addl_pkg_arches/*
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
+%{_initrddir}/%{name}-server
 
 %files common
 %defattr(-, root, root)