extras-buildsys ChangeLog, 1.126.2.44.2.1.2.11, 1.126.2.44.2.1.2.12 plague.spec, 1.27.2.5.2.1.2.1, 1.27.2.5.2.1.2.2

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Sat Jun 14 10:43:40 UTC 2008


Author: mschwendt

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

Modified Files:
      Tag: Plague-0_4_5
	ChangeLog plague.spec 
Log Message:
move plague-builder home to /var/lib/plague/builder + spec updates


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.44.2.1.2.11
retrieving revision 1.126.2.44.2.1.2.12
diff -u -r1.126.2.44.2.1.2.11 -r1.126.2.44.2.1.2.12
--- ChangeLog	5 Mar 2008 22:39:43 -0000	1.126.2.44.2.1.2.11
+++ ChangeLog	14 Jun 2008 10:43:40 -0000	1.126.2.44.2.1.2.12
@@ -1,3 +1,8 @@
+2008-06-14  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* builder/Config.py
+	  - Change builder_work default to /var/lib/plague/builder
+
 2008-03-05  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* server/Repo.py


Index: plague.spec
===================================================================
RCS file: /cvs/fedora/extras-buildsys/plague.spec,v
retrieving revision 1.27.2.5.2.1.2.1
retrieving revision 1.27.2.5.2.1.2.2
diff -u -r1.27.2.5.2.1.2.1 -r1.27.2.5.2.1.2.2
--- plague.spec	31 Jan 2008 14:45:56 -0000	1.27.2.5.2.1.2.1
+++ plague.spec	14 Jun 2008 10:43:40 -0000	1.27.2.5.2.1.2.2
@@ -3,8 +3,8 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5
-Release: 0.1%{?dist}
-License: GPL
+Release: 0.2%{?dist}
+License: GPLv2+
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
@@ -72,12 +72,12 @@
 
 %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
-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
-mkdir -p $RPM_BUILD_ROOT/srv/plague_builder
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+install -p -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder
+install -p -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder
+install -p -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server
+mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %clean
@@ -95,7 +95,7 @@
 fi
 
 %pre builder
-/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || :
+/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /var/lib/plague/builder plague-builder 2>/dev/null || :
 
 %post builder
 /sbin/chkconfig --add plague-builder
@@ -134,7 +134,8 @@
 %dir %{_sysconfdir}/%{name}/builder/certs
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder
 %{_initrddir}/%{name}-builder
-%attr(0755, plague-builder, plague-builder) /srv/plague_builder
+%dir /var/lib/plague
+%attr(0755, plague-builder, plague-builder) /var/lib/plague/builder
 
 %files client
 %defattr(-, root, root)
@@ -147,6 +148,11 @@
 
 
 %changelog
+* Sat Jun 14 2008 Michael Schwendt <mschwendt at fedoraproject.org>
+- Caution! Move plague-builder home to /var/lib/plague/builder
+  (this breaks upgrades).
+- Use install -p.
+
 * Tue Sep 18 2007 Michael Schwendt <mschwendt at fedoraproject.org>
 - Require mock < 0.8 since EPEL4 includes mock 0.7.
 - Add dirs /etc/plague and /usr/share/plague to plague-common




More information about the fedora-extras-commits mailing list