X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pld-builder.spec;h=3af980cbb0a9759df01f7607b31d3b6309c77471;hb=6fc5dac34d43aef49c64bdd585076813f178e55e;hp=823ef325d284727883c2deba5a3fd461acad772e;hpb=ab3f03b2c4c94116df1660947cecef4c7400e2bf;p=packages%2Fpld-builder.git

diff --git a/pld-builder.spec b/pld-builder.spec
index 823ef32..3af980c 100644
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,4 +1,4 @@
-%define		snap	20100509
+%define		snap	20111127
 Summary:	PLD RPM builder environment
 Summary(pl.UTF-8):	Środowisko budowniczego pakietów RPM dla PLD
 Name:		pld-builder
@@ -7,9 +7,14 @@ Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	e9a5c9c45ed2fbd6c99200031cd7260f
+# Source0-md5:	e9aeb082ad8f2b7d653b24a17ef87b7f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Source3:	poldek.conf
+Source4:	rpm.macros
+Source5:	crontab
+Source6:	procmailrc
+Source7:	sudo
 URL:		http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
 BuildRequires:	python
 BuildRequires:	rpm-pythonprov
@@ -24,6 +29,7 @@ Requires(pre):	/usr/sbin/useradd
 Requires:	/usr/lib/sendmail
 Requires:	bash
 Requires:	crondaemon
+Requires:	filesystem >= 3.0-33
 Requires:	gnupg
 Requires:	libuuid
 Requires:	python
@@ -78,6 +84,7 @@ Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	bash
+Requires:	filesystem >= 3.0-33
 Requires:	mount
 Requires:	poldek >= 0.21-0.20070703.00.16
 Requires:	rpm-build
@@ -109,60 +116,6 @@ Ten pakiet należy zainstalować w środowisku chroot buildera.
 	s,/spools/ready,/var/cache/%{name}/ready,
 ' config/builder.conf
 
-cat <<'EOF' > poldek.conf
-# locally cached rpms
-[source]
-name = ready
-pri  = -1
-type = pndir
-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' > 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@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
@@ -172,11 +125,11 @@ rm -rf $RPM_BUILD_ROOT
 
 # python
 install -d $RPM_BUILD_ROOT%{py_scriptdir}/PLD_Builder
-cp -a PLD_Builder/*.py[co] $RPM_BUILD_ROOT%{py_scriptdir}/PLD_Builder
+cp -p PLD_Builder/*.py[co] $RPM_BUILD_ROOT%{py_scriptdir}/PLD_Builder
 
 # other
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a config/{rsync-passwords,*.conf} $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p config/{rsync-passwords,*.conf} $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/{bin,admin}
 for a in bin/*.sh; do
 sed -e '
@@ -190,7 +143,7 @@ cp -a admin/*.sh $RPM_BUILD_ROOT%{_datadir}/admin
 install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name}/{spool/{buildlogs,builds,ftp,notify},lock},/etc/{sysconfig,rc.d/init.d}}
 install -d $RPM_BUILD_ROOT/home/services/builder/.gnupg
 install -d $RPM_BUILD_ROOT/home/services/builder/.ssh
-install -d $RPM_BUILD_ROOT/home/services/builder/rpm/{BUILD,RPMS,SRPMS,packages/CVS}
+install -d $RPM_BUILD_ROOT/home/services/builder/rpm/{BUILD,RPMS,SRPMS,SPECS,SOURCES,packages/CVS}
 install -d $RPM_BUILD_ROOT/var/cache/%{name}/ready
 ln -s %{_bindir}/builder $RPM_BUILD_ROOT/home/services/builder/rpm/packages
 
@@ -199,17 +152,21 @@ echo ":pserver:cvs@cvs.pld-linux.org:/cvsroot" > $RPM_BUILD_ROOT/home/services/b
 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 -p %{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 -p %{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 -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+
+# sudo
+install -d $RPM_BUILD_ROOT/etc/sudoers.d
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sudoers.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 -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
 
 # from admin/fresh-queue.sh
 cd $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
@@ -267,6 +224,7 @@ fi
 %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}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sudoers.d/%{name}
 
 %dir %{_sysconfdir}
 %attr(640,root,builder) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
@@ -305,6 +263,8 @@ fi
 %dir %attr(750,builder,builder) /home/services/builder/rpm/BUILD
 %dir %attr(750,builder,builder) /home/services/builder/rpm/RPMS
 %dir %attr(750,builder,builder) /home/services/builder/rpm/SRPMS
+%dir %attr(750,builder,builder) /home/services/builder/rpm/SPECS
+%dir %attr(750,builder,builder) /home/services/builder/rpm/SOURCES
 %dir %attr(750,builder,builder) /home/services/builder/rpm/packages
 
 # for srpm builder