]> git.pld-linux.org Git - packages/pld-builder.git/blobdiff - pld-builder.spec
projects / packages / pld-builder.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- add sudoers rule
[packages/pld-builder.git] / pld-builder.spec
diff --git a/pld-builder.spec b/pld-builder.spec
index c4a22eee599f4ca63c4a0c4536912394c31b4189..3af980cbb0a9759df01f7607b31d3b6309c77471 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,14 +1,20 @@
+%define                snap    20111127
 Summary:       PLD RPM builder environment
 Summary(pl.UTF-8):     Środowisko budowniczego pakietów RPM dla PLD
 Name:          pld-builder
-Version:       0.2
-Release:       0.1
+Version:       0.5.%{snap}
+Release:       1
 License:       GPL
 Group:         Development/Building
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 7699bd2ac6da8f5f771ed4a5725acaa6
+# 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
@@ -20,17 +26,19 @@ 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:      filesystem >= 3.0-33
 Requires:      gnupg
 Requires:      libuuid
 Requires:      python
 Requires:      python-pld-builder = %{version}-%{release}
 Requires:      rc-scripts
+Requires:      rsync
+Requires:      sudo
 Provides:      group(builder)
 Provides:      user(builder)
-Provides:      user(ftpac)
-Provides:      user(srpms_builder)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,10 +84,19 @@ 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
+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
+Requires:      cvs-client
+Requires:      rpm-build-tools
 
 %description chroot
 This is the package to be installed in builder chroot.
@@ -89,13 +106,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 '
@@ -103,15 +116,6 @@ mv jak-wysy?a?-zlecenia.txt jak-wysylac-zlecenia.txt
        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
-
 %build
 %{__make}
 %py_lint PLD_Builder
@@ -121,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 '
@@ -136,21 +140,37 @@ 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,SOURCES,SPECS,SRPMS}
+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
+
+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 -p %{SOURCE3} $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
+
+install -d $RPM_BUILD_ROOT/etc/rpm
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rpm/macros.builder
+
+# crontab
+install -d $RPM_BUILD_ROOT/etc/cron.d
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
-cp -a poldek.conf $RPM_BUILD_ROOT/etc/poldek/repos.d/%{name}.conf
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
+# sudo
+install -d $RPM_BUILD_ROOT/etc/sudoers.d
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
+
+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}
-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
@@ -167,9 +187,7 @@ 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
@@ -177,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
@@ -187,9 +204,7 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       %userremove srpms_builder
        %userremove builder
-       %userremove ftpac
        %groupremove builder
 fi
 
@@ -208,8 +223,12 @@ fi
 %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}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sudoers.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
@@ -233,11 +252,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
@@ -248,9 +262,21 @@ fi
 %dir %attr(750,builder,builder) /home/services/builder/rpm
 %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/SOURCES
-%dir %attr(750,builder,builder) /home/services/builder/rpm/SPECS
 %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
+%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
 
 # locally cached rpms from bin-builder
 %config(noreplace) %verify(not md5 mtime size) /etc/poldek/repos.d/%{name}.conf
PLD Linux RPM builder environment
This page took 0.075399 seconds and 4 git commands to generate.