- current snap (20100901)

[packages/pld-builder.git] / pld-builder.spec

diff --git a/pld-builder.spec b/pld-builder.spec
index d038f972d38c0b03c82af5522c9955038f6ddef2..8becc685da5e6664959478c1b5638251ba3d922e 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,12 +1,13 @@
+%define                snap    20100901
 Summary:       PLD RPM builder environment
 Summary(pl.UTF-8):     Środowisko budowniczego pakietów RPM dla PLD
 Name:          pld-builder
-Version:       0.2
-Release:       0.55
+Version:       0.5.%{snap}
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 7699bd2ac6da8f5f771ed4a5725acaa6
+# Source0-md5: e9a5c9c45ed2fbd6c99200031cd7260f
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 URL:           http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
@@ -20,6 +21,7 @@ Requires(pre):        /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      /usr/lib/sendmail
 Requires:      bash
 Requires:      crondaemon
 Requires:      gnupg
@@ -27,6 +29,8 @@ Requires:     libuuid
 Requires:      python
 Requires:      python-pld-builder = %{version}-%{release}
 Requires:      rc-scripts
+Requires:      rsync
+Requires:      sudo
 Provides:      group(builder)
 Provides:      user(builder)
 BuildArch:     noarch
@@ -74,9 +78,13 @@ Requires(pre):       /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      bash
+Requires:      mount
 Requires:      poldek >= 0.21-0.20070703.00.16
 Requires:      rpm-build
 Requires:      tmpwatch
+# NOTE: vserver-packages is usually hidden, so you must install it manually with --noignore
+Requires:      basesystem
+Requires:      vserver-packages
 Provides:      group(builder)
 Provides:      user(builder)
 # for srpm builder
@@ -91,13 +99,9 @@ Ten pakiet należy zainstalować w środowisku chroot buildera.
 
 %prep
 %setup -q
-
-mv jak-wysy?a?-zlecenia.txt jak-wysylac-zlecenia.txt
-
 %{__sed} -i -e '
-       s,~/pld-builder.new/,%{_sharedstatedir}/%{name}/,
-       /^conf_dir/s,=.*,= "%{_sysconfdir}/",
-
+       /^root_dir/s,=.*,= "%{_sharedstatedir}/%{name}",
+       /^conf_dir/s,=.*,= "%{_sysconfdir}",
 ' PLD_Builder/path.py
 
 %{__sed} -i -e '
@@ -125,6 +129,24 @@ MAILTO=root
 #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
 
@@ -165,16 +187,16 @@ done
 cp -a admin/*.sh $RPM_BUILD_ROOT%{_datadir}/admin
 
 # 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{%{_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,{SOURCES,SPECS}/CVS}
+install -d $RPM_BUILD_ROOT/home/services/builder/rpm/{BUILD,RPMS,SRPMS,packages/CVS}
 install -d $RPM_BUILD_ROOT/var/cache/%{name}/ready
-ln -s %{_bindir}/builder $RPM_BUILD_ROOT/home/services/builder/rpm/SPECS
+ln -s %{_bindir}/builder $RPM_BUILD_ROOT/home/services/builder/rpm/packages
 
-echo "SPECS" > $RPM_BUILD_ROOT/home/services/builder/rpm/SPECS/CVS/Repository
-echo ":pserver:cvs@cvs.pld-linux.org:/cvsroot" > $RPM_BUILD_ROOT/home/services/builder/rpm/SPECS/CVS/Root
-touch $RPM_BUILD_ROOT/home/services/builder/rpm/SPECS/CVS/Entries{,.Static}
+echo "packages" > $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Repository
+echo ":pserver:cvs@cvs.pld-linux.org:/cvsroot" > $RPM_BUILD_ROOT/home/services/builder/rpm/packages/CVS/Root
+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
@@ -191,8 +213,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
 
 # from admin/fresh-queue.sh
 cd $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
-install -d spool/{builds,buildlogs,notify,ftp} www/srpms lock
-echo 0 > www/max_req_no
+install -d spool/{builds,buildlogs,notify,ftp} lock
 echo 0 > spool/last_req_no
 echo -n > spool/processed_ids
 echo -n > spool/got_lock
@@ -217,7 +238,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -249,7 +269,8 @@ fi
 %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}/*
+%attr(640,root,builder) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%attr(640,root,builder) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsync-passwords
 
 %dir %{_datadir}
 %dir %{_datadir}/bin
@@ -273,11 +294,6 @@ fi
 
 %dir %attr(775,root,builder) %{_sharedstatedir}/%{name}/lock
 
-%dir %{_sharedstatedir}/%{name}/www
-%dir %{_sharedstatedir}/%{name}/www/rpms
-%dir %{_sharedstatedir}/%{name}/www/srpms
-%attr(644,builder,builder) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/%{name}/www/max_req_no
-
 %dir %attr(750,builder,builder) /home/services/builder
 %dir %attr(750,builder,builder) /home/services/builder/.gnupg
 %dir %attr(700,builder,builder) /home/services/builder/.ssh
@@ -289,16 +305,15 @@ 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/SOURCES
-%dir %attr(750,builder,builder) /home/services/builder/rpm/SPECS
+%dir %attr(750,builder,builder) /home/services/builder/rpm/packages
 
 # for srpm builder
-%attr(750,builder,builder) /home/services/builder/rpm/SPECS/builder
-%dir %attr(750,builder,builder) /home/services/builder/rpm/SPECS/CVS
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/SPECS/CVS/Repository
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/SPECS/CVS/Root
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/SPECS/CVS/Entries
-%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/SPECS/CVS/Entries.Static
+%attr(750,builder,builder) /home/services/builder/rpm/packages/builder
+%dir %attr(750,builder,builder) /home/services/builder/rpm/packages/CVS
+%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Repository
+%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Root
+%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Entries
+%attr(640,builder,builder) %config(noreplace) %verify(not md5 mtime size) /home/services/builder/rpm/packages/CVS/Entries.Static
 
 # minimal but sane defaults for rpm inside chroot
 %config(noreplace) %verify(not md5 mtime size) /etc/rpm/macros.builder