extras-buildsys ChangeLog,1.49,1.50 plague.spec,1.10,1.11

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Sun Jul 10 04:48:40 UTC 2005


Author: dcbw

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

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

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




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	10 Jul 2005 03:44:35 -0000	1.49
+++ ChangeLog	10 Jul 2005 04:48:38 -0000	1.50
@@ -1,5 +1,10 @@
 2005-07-09  Dan Williams <dcbw at redhat.com>
 
+    Patch from Ignacio Vazquez-Abrams <ivazquez at ivazquez.net>
+    * Add initscript/daemonize support for the builder
+
+2005-07-09  Dan Williams <dcbw at redhat.com>
+
     * Rework the authorization framework so we don't need to
         subclass/override subclass so much stuff
 


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plague.spec	10 Jul 2005 03:44:35 -0000	1.10
+++ plague.spec	10 Jul 2005 04:48:38 -0000	1.11
@@ -33,6 +33,9 @@
 Requires: %{name}-common = %{version}-%{release}
 Requires: yum >= 2.2.1
 Requires: mock >= 0.3, pyOpenSSL
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 
 %description builder
 The Plague build client does the actual RPM package building on slave
@@ -70,12 +73,27 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 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
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post builder
+/sbin/chkconfig --add plague-builder
+. %{_sysconfdir}/sysconfig/%{name}-builder
+if [ -z "$ARCHS" ] ; then
+  sed -ie "s/^ARCHS=.*$/ARCHS=$(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/')/" %{_sysconfdir}/sysconfig/%{name}-builder
+endif
+
+%preun builder
+if [ $1 = 0 ]; then
+  /sbin/service plague-builder stop &> /dev/null
+  /sbin/chkconfig --del plague-builder
+fi
+
 %files
 %defattr(-, root, root)
 %doc README ChangeLog
@@ -98,6 +116,8 @@
 %dir  %{_sysconfdir}/%{name}/builder
 %config(noreplace) %{_sysconfdir}/%{name}/builder/CONFIG.py*
 %dir  %{_sysconfdir}/%{name}/builder/certs
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
+%{_initrddir}/%{name}-builder
 
 %files client
 %defattr(-, root, root)




More information about the fedora-extras-commits mailing list