SPECS: pld-builder.spec - remove srpms_builder, ftpac those are on ep09 - a...

[glen]

Author: glen                         Date: Tue Oct 28 23:36:19 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove srpms_builder, ftpac those are on ep09
- add system crontab

---- Files affected:
SPECS:
   pld-builder.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/pld-builder.spec
diff -u SPECS/pld-builder.spec:1.50 SPECS/pld-builder.spec:1.51
--- SPECS/pld-builder.spec:1.50	Mon Aug 25 20:23:32 2008
+++ SPECS/pld-builder.spec	Wed Oct 29 00:36:13 2008
@@ -30,8 +30,6 @@
 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)
 
@@ -114,6 +112,17 @@
 path = /var/cache/%{name}/ready
 EOF
 
+cat <<'EOF' > crontab
+SHELL=/bin/sh
+MAILTO=root
+
+#* * * * * builder exec nice -n 19 %{_datadir}/bin/request-fetcher.sh
+#* * * * * builder exec nice -n 19 %{_datadir}/bin/load-balancer.sh
+#* * * * * builder exec nice -n 19 %{_datadir}/bin/file-sender.sh
+
+#0 0 * * * chroot /home/users/builder/chroot-ac nice -n 19 tmpwatch -m 240 /var/cache/%{name}/ready
+EOF
+
 cat <<'EOF' > rpm.macros
 # rpm macros for pld builder chroot
 
@@ -126,7 +135,8 @@
 
 # Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
 # marked as %doc should be installed.
-%%_excludedocs   1
+# FIXME: excludedocs breaks kde build
+#%%_excludedocs   1
 EOF
 
 %build
@@ -182,15 +192,16 @@
 		echo '<queue/>' > spool/queue-$bb
 	done
 fi
+# crontab
+install -d $RPM_BUILD_ROOT/etc/cron.d
+cp -a crontab $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 181 builder
-%useradd -u 181 -g builder -c "srpms builder" srpms_builder
 %useradd -u 182 -g builder -c "bin builder" -s /bin/bash -d /home/services/builder builder
-%useradd -u 183 -g daemon -c "ftpac" ftpac
 
 %pre chroot
 %groupadd -g 181 builder
@@ -208,9 +219,7 @@
 
 %postun
 if [ "$1" = "0" ]; then
-	%userremove srpms_builder
 	%userremove builder
-	%userremove ftpac
 	%groupremove builder
 fi
 
@@ -229,6 +238,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/pld-builder
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pld-builder
 
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
+
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 
@@ -291,6 +302,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2008/10/28 23:36:13  glen
+- remove srpms_builder, ftpac those are on ep09
+- add system crontab
+
 Revision 1.50  2008/08/25 18:23:32  glen
 - rpm macros for chroot
 
================================================================

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