SPECS: pld-builder.spec - add chroot pkg

[glen]

Author: glen                         Date: Tue Jul 15 10:20:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add chroot pkg

---- Files affected:
SPECS:
   pld-builder.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/pld-builder.spec
diff -u SPECS/pld-builder.spec:1.37 SPECS/pld-builder.spec:1.38
--- SPECS/pld-builder.spec:1.37	Tue Jul 15 12:00:51 2008
+++ SPECS/pld-builder.spec	Tue Jul 15 12:20:06 2008
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Środowisko budowniczego pakietów RPM dla PLD
 Name:		pld-builder
 Version:	0.0.%{snap}
-Release:	0.28
+Release:	0.34
 License:	GPL
 Group:		Development/Building
 Source0:	%{name}.new-%{snap}.tar.bz2
@@ -25,6 +25,10 @@
 Requires:	libuuid
 Requires:	python-pld-builder = %{version}-%{release}
 Requires:	rc-scripts
+Provides:	group(builder)
+Provides:	user(builder)
+Provides:	user(ftpac)
+Provides:	user(srpms_builder)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,6 +64,21 @@
 %description -n python-pld-builder -l pl.UTF-8
 Kod pythonowy budowniczego PLD.
 
+%package chroot
+Summary:	PLD Builder chroot
+Group:		Development/Building
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rpm-build
+Provides:	group(builder)
+Provides:	user(builder)
+
+%description chroot
+This is the package to be installed in builder chroot.
+
 %package client
 Summary:	PLD Builder client
 Summary(pl.UTF-8):	Klient budowniczych PLD
@@ -115,13 +134,14 @@
 
 # dirs
 install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name}/{spool/{buildlogs,builds,ftp,notify},lock,www/{s,}rpms},/etc/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT/home/services/builder
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
 
 # from admin/fresh-queue.sh
 cd $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
-mkdir -p spool/{builds,buildlogs,notify,ftp} www/srpms lock
+install -d spool/{builds,buildlogs,notify,ftp} www/srpms lock
 echo 0 > www/max_req_no
 echo 0 > spool/last_req_no
 echo -n > spool/processed_ids
@@ -138,11 +158,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -g 181 pld-builder
-%useradd -u 181 -g pld-builder -c "srpms builder" srpms_builder
-%useradd -u 182 -g pld-builder -c "bin builder" bin_builder
+%groupadd -g 181 builder
+%useradd -u 181 -g builder -c "srpms builder" srpms_builder
+%useradd -u 182 -g builder -c "bin builder" -s /bin/sh -d /home/services/builder builder
 %useradd -u 183 -g daemon -c "ftpac" ftpac
 
+%pre chroot
+%groupadd -g 181 builder
+%useradd -u 182 -g builder -c "bin builder" -s /bin/sh -d /home/services/builder builder
+
 %post
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -156,9 +180,15 @@
 %postun
 if [ "$1" = "0" ]; then
 	%userremove srpms_builder
-	%userremove bin_builder
+	%userremove builder
 	%userremove ftpac
-	%groupremove pld-builder
+	%groupremove builder
+fi
+
+%postun chroot
+if [ "$1" = "0" ]; then
+	%userremove builder
+	%groupremove builder
 fi
 
 %files
@@ -181,11 +211,11 @@
 
 %dir %{_sharedstatedir}/%{name}
 
-%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool
-%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool/buildlogs
+%dir %attr(775,root,builder) %{_sharedstatedir}/%{name}/spool
+%dir %attr(775,root,builder) %{_sharedstatedir}/%{name}/spool/buildlogs
 %dir %{_sharedstatedir}/%{name}/spool/builds
 %dir %{_sharedstatedir}/%{name}/spool/ftp
-%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool/notify
+%dir %attr(775,root,builder) %{_sharedstatedir}/%{name}/spool/notify
 
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/spool/got_lock
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/spool/last_req_no
@@ -193,13 +223,19 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/spool/queue
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/spool/req_queue
 
-%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/lock
+%dir %attr(775,root,builder) %{_sharedstatedir}/%{name}/lock
 
 %dir %{_sharedstatedir}/%{name}/www
 %dir %{_sharedstatedir}/%{name}/www/rpms
 %dir %{_sharedstatedir}/%{name}/www/srpms
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/www/max_req_no
 
+%dir %attr(750,builder,builder) /home/services/builder
+
+%files chroot
+%defattr(644,root,root,755)
+%dir %attr(750,builder,builder) /home/services/builder
+
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}-make-request
@@ -214,6 +250,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2008/07/15 10:20:06  glen
+- add chroot pkg
+
 Revision 1.37  2008/07/15 10:00:51  glen
 - init structure using code from admin/fresh-queue.sh
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pld-builder.spec?r1=1.37&r2=1.38&f=u