- current snap (20100901)

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

diff --git a/pld-builder.spec b/pld-builder.spec
index 0e94ab0085e6e88e213662392493085201b7a356..8becc685da5e6664959478c1b5638251ba3d922e 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,13 +1,13 @@
-%define                snap    20100121
+%define                snap    20100901
 Summary:       PLD RPM builder environment
 Summary(pl.UTF-8):     Środowisko budowniczego pakietów RPM dla PLD
 Name:          pld-builder
 Version:       0.5.%{snap}
-Release:       2
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: d282da54be3fdd419d518def38dc1555
+# Source0-md5: e9a5c9c45ed2fbd6c99200031cd7260f
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 URL:           http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
@@ -21,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
@@ -81,6 +82,9 @@ 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
@@ -183,7 +187,7 @@ 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,packages/CVS}
@@ -209,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
@@ -235,7 +238,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -267,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
@@ -291,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