packages: pld-builder/pld-builder.spec, pld-builder/crontab (NEW), pld-buil...

glen glen at pld-linux.org
Tue Dec 28 14:39:05 CET 2010


Author: glen                         Date: Tue Dec 28 13:39:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move heredocs to individual source files

---- Files affected:
packages/pld-builder:
   pld-builder.spec (1.76 -> 1.77) , crontab (NONE -> 1.1)  (NEW), poldek.conf (NONE -> 1.1)  (NEW), procmailrc (NONE -> 1.1)  (NEW), rpm.macros (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pld-builder/pld-builder.spec
diff -u packages/pld-builder/pld-builder.spec:1.76 packages/pld-builder/pld-builder.spec:1.77
--- packages/pld-builder/pld-builder.spec:1.76	Tue Dec 28 14:33:21 2010
+++ packages/pld-builder/pld-builder.spec	Tue Dec 28 14:39:00 2010
@@ -11,6 +11,10 @@
 # Source0-md5:	d568f81712e1421a47b23b68f7ef0572
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	poldek.conf
+Source4:	rpm.macros
+Source5:	crontab
+Source6:	procmailrc
 URL:		http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
 BuildRequires:	python
 BuildRequires:	rpm-pythonprov
@@ -112,61 +116,6 @@
 	s,/spools/ready,/var/cache/%{name}/ready,
 ' config/builder.conf
 
-cat <<'EOF' > poldek.conf
-# locally cached rpms
-[source]
-name   = ready
-pri    = -1
-type   = dir
-path   = /var/cache/%{name}/ready/
-autoup = no
-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' > procmailrc
-LOGFILE=procmail.log
-
-#:0 c
-#mail.copy
-
-:0
-* ^X-New-PLD-Builder:
-| %{_datadir}/bin/request-handler.sh
-
-:0
-* ^FROM_MAILER
-/dev/null
-
-#:0
-#!root at example.org
-EOF
-
-cat <<'EOF' > rpm.macros
-# rpm macros for pld builder chroot
-
-# A colon separated list of desired locales to be installed;
-# "all" means install all locale specific files.
-%%_install_langs en_US
-
-# If non-zero, all erasures will be automagically repackaged.
-%%_repackage_all_erasures    0
-
-# Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
-# marked as %doc should be installed.
-# FIXME: excludedocs breaks kde build
-#%%_excludedocs   1
-EOF
-
 %build
 %{__make}
 %py_lint PLD_Builder
@@ -203,17 +152,17 @@
 touch $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Entries{,.Static}
 
 install -d $RPM_BUILD_ROOT/etc/poldek/repos.d
-cp -a poldek.conf $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/rpm
-cp -a rpm.macros $RPM_BUILD_ROOT/etc/rpm/macros.builder
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/rpm/macros.builder
 
 # crontab
 install -d $RPM_BUILD_ROOT/etc/cron.d
-cp -a crontab $RPM_BUILD_ROOT/etc/cron.d/%{name}
+cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
 
 # from admin/fresh-queue.sh
 cd $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
@@ -339,6 +288,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2010/12/28 13:39:00  glen
+- move heredocs to individual source files
+
 Revision 1.76  2010/12/28 13:33:21  glen
 - type=dir poldek indexes not updateable
 - new snap

================================================================
Index: packages/pld-builder/crontab
diff -u /dev/null packages/pld-builder/crontab:1.1
--- /dev/null	Tue Dec 28 14:39:05 2010
+++ packages/pld-builder/crontab	Tue Dec 28 14:39:00 2010
@@ -0,0 +1,8 @@
+SHELL=/bin/sh
+MAILTO=root
+
+#* * * * * builder exec nice -n 19 /usr/share/pld-builder/bin/request-fetcher.sh
+#* * * * * builder exec nice -n 19 /usr/share/pld-builder/bin/load-balancer.sh
+#* * * * * builder exec nice -n 19 /usr/share/pld-builder/bin/file-sender.sh
+
+#0 0 * * * chroot /home/users/builder/chroot-ac nice -n 19 tmpwatch -m 240 /var/cache/pld-builder/ready

================================================================
Index: packages/pld-builder/poldek.conf
diff -u /dev/null packages/pld-builder/poldek.conf:1.1
--- /dev/null	Tue Dec 28 14:39:06 2010
+++ packages/pld-builder/poldek.conf	Tue Dec 28 14:39:00 2010
@@ -0,0 +1,7 @@
+# locally cached rpms
+[source]
+name   = ready
+pri    = -1
+type   = dir
+path   = /var/cache/pld-builder/ready/
+autoup = no

================================================================
Index: packages/pld-builder/procmailrc
diff -u /dev/null packages/pld-builder/procmailrc:1.1
--- /dev/null	Tue Dec 28 14:39:06 2010
+++ packages/pld-builder/procmailrc	Tue Dec 28 14:39:00 2010
@@ -0,0 +1,15 @@
+LOGFILE=procmail.log
+
+#:0 c
+#mail.copy
+
+:0
+* ^X-New-PLD-Builder:
+| /usr/share/pld-builder/bin/request-handler.sh
+
+:0
+* ^FROM_MAILER
+/dev/null
+
+#:0
+#!root at example.org

================================================================
Index: packages/pld-builder/rpm.macros
diff -u /dev/null packages/pld-builder/rpm.macros:1.1
--- /dev/null	Tue Dec 28 14:39:06 2010
+++ packages/pld-builder/rpm.macros	Tue Dec 28 14:39:00 2010
@@ -0,0 +1,13 @@
+# rpm macros for pld builder chroot
+
+# A colon separated list of desired locales to be installed;
+# "all" means install all locale specific files.
+%_install_langs en_US
+
+# If non-zero, all erasures will be automagically repackaged.
+%_repackage_all_erasures    0
+
+# Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
+# marked as %doc should be installed.
+# FIXME: excludedocs breaks kde build
+#%_excludedocs   1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pld-builder/pld-builder.spec?r1=1.76&r2=1.77&f=u



More information about the pld-cvs-commit mailing list