- Added suport for storing files in chroot-$ARCH/home/users/builder/Attic

- One entry in crontab should remove files on Attic older than 3 days
- Changed all /home/users/builder in spec to %{_builderdir}
- In buildrpm-cron added . $HOME/.builderrc it should solve the problem
  with setting $ARCH varible.
- Version = 1.2
- Not yet properly tested. Pleace do it.

Changed files:
    pld-builder.spec -> 1.4

diff --git a/pld-builder.spec b/pld-builder.spec
index d526d35a297c96a5bc7da331cb55b563dce1600f..a2c71f88fe22f306f7c056f5564582e0c7873db7 100644 (file)
--- a/pld-builder.spec
+++ b/pld-builder.spec
@@ -1,7 +1,7 @@
 Summary:       PLD rpm builder environment
 Summary(pl):   ¦rodowisko budowniczego pakietów dla PLD
 Name:          pld-builder
-Version:       1.1
+Version:       1.2
 Release:       1
 License:       GPL
 Group:         Development/Building
@@ -22,6 +22,8 @@ Requires:     fileutils
 Requires:      openssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define _builderdir /home/users/builder
+
 %description
 PLD rpm builder environment.
 
@@ -37,36 +39,36 @@ echo "ARCH=%{_target_cpu}" >> chroot/.builderrc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/home/users/builder/{.requests-%{_target_cpu},bin} \
-       $RPM_BUILD_ROOT/home/users/builder/chroot-%{_target_cpu}/home/users/builder/bin \
+install -d $RPM_BUILD_ROOT%{_builderdir}/{.requests-%{_target_cpu},bin,Attic} \
+       $RPM_BUILD_ROOT%{_builderdir}/chroot-%{_target_cpu}/home/users/builder/bin \
        $RPM_BUILD_ROOT/etc/cron.d
 
-install .builderrc $RPM_BUILD_ROOT/home/users/builder/
-install .procmailrc $RPM_BUILD_ROOT/home/users/builder/
-install bin/* $RPM_BUILD_ROOT/home/users/builder/bin/
+install .builderrc $RPM_BUILD_ROOT%{_builderdir}/
+install .procmailrc $RPM_BUILD_ROOT%{_builderdir}/
+install bin/* $RPM_BUILD_ROOT%{_builderdir}/bin/
 
-install chroot/.builderrc $RPM_BUILD_ROOT/home/users/builder/chroot-%{_target_cpu}/home/users/builder/
-install chroot/.rpmmacros $RPM_BUILD_ROOT/home/users/builder/chroot-%{_target_cpu}/home/users/builder/
+install chroot/.builderrc $RPM_BUILD_ROOT%{_builderdir}/chroot-%{_target_cpu}/home/users/builder/
+install chroot/.rpmmacros $RPM_BUILD_ROOT%{_builderdir}/chroot-%{_target_cpu}/home/users/builder/
 %ifarch %{ix86}
-install chroot/.rpmrc.%{_target_cpu} $RPM_BUILD_ROOT/home/users/builder/chroot-%{_target_cpu}/home/users/builder/.rpmrc
+install chroot/.rpmrc.%{_target_cpu} $RPM_BUILD_ROOT%{_builderdir}/chroot-%{_target_cpu}/home/users/builder/.rpmrc
 %endif
-install chroot/bin/* $RPM_BUILD_ROOT/home/users/builder/chroot-%{_target_cpu}/home/users/builder/bin/
+install chroot/bin/* $RPM_BUILD_ROOT%{_builderdir}/chroot-%{_target_cpu}/home/users/builder/bin/
 
-mv $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron.bak
-cat > $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron <<EOF
+mv $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron.bak
+cat > $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron <<EOF
 #!/bin/sh
 
 ARCH=%{_target_cpu}
 EOF
-cat $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron.bak >> $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron
-rm -f $RPM_BUILD_ROOT/home/users/builder/bin/buildrpm-cron.bak
+cat $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron.bak >> $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron
+rm -f $RPM_BUILD_ROOT%{_builderdir}/bin/buildrpm-cron.bak
 
 install cron/builder $RPM_BUILD_ROOT/etc/cron.d/
 
 %pre
 if [ "$1" = "1" ]; then
        if [ ! -n "`id -u builder 2>/dev/null`" ]; then
-               %{_sbindir}/useradd -g users -d /home/users/builder -m -s /bin/bash builder 2> /dev/null
+               %{_sbindir}/useradd -g users -d %{_builderdir} -m -s /bin/bash builder 2> /dev/null
        fi
 fi
 
@@ -81,15 +83,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(600,builder,builder,700)
 %attr(640,root,root) /etc/cron.d/builder
-%dir /home/users/builder
-%dir /home/users/builder/.requests-%{_target_cpu}
-%dir /home/users/builder/bin
-%dir /home/users/builder/chroot-%{_target_cpu}
-%dir /home/users/builder/chroot-%{_target_cpu}/home/users/builder
-%dir /home/users/builder/chroot-%{_target_cpu}/home/users/builder/bin
-%config(noreplace) %verify(not size mtime md5) /home/users/builder/.builderrc
-%config(noreplace) %verify(not size mtime md5) /home/users/builder/.procmailrc
-%config(noreplace) %verify(not size mtime md5) /home/users/builder/chroot-%{_target_cpu}/home/users/builder/.builderrc
-%config(noreplace) %verify(not size mtime md5) /home/users/builder/chroot-%{_target_cpu}/home/users/builder/.rpm*
-%attr(700,builder,builder) %config(noreplace) %verify(not size mtime md5) /home/users/builder/bin/*
-%attr(700,builder,builder) %config(noreplace) %verify(not size mtime md5) /home/users/builder/chroot-%{_target_cpu}/home/users/builder/bin/*
+%dir %{_builderdir}
+%dir %{_builderdir}/.requests-%{_target_cpu}
+%dir %{_builderdir}/bin
+%dir %{_builderdir}/chroot-%{_target_cpu}
+%dir %{_builderdir}/chroot-%{_target_cpu}/home/users/builder
+%dir %{_builderdir}/chroot-%{_target_cpu}/home/users/builder/bin
+%config(noreplace) %verify(not size mtime md5) %{_builderdir}/.builderrc
+%config(noreplace) %verify(not size mtime md5) %{_builderdir}/.procmailrc
+%config(noreplace) %verify(not size mtime md5) %{_builderdir}/chroot-%{_target_cpu}/home/users/builder/.builderrc
+%config(noreplace) %verify(not size mtime md5) %{_builderdir}/chroot-%{_target_cpu}/home/users/builder/.rpm*
+%attr(700,builder,builder) %config(noreplace) %verify(not size mtime md5) %{_builderdir}/bin/*
+%attr(700,builder,builder) %config(noreplace) %verify(not size mtime md5) %{_builderdir}/chroot-%{_target_cpu}/home/users/builder/bin/*