- version 1.1

Changed files:
    pld-builder.spec -> 1.3

diff --git a/pld-builder.spec b/pld-builder.spec
index 98738da37844b71a6ffc972500b2f0f3806d6350..d526d35a297c96a5bc7da331cb55b563dce1600f 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.0
+Version:       1.1
 Release:       1
 License:       GPL
 Group:         Development/Building
@@ -37,7 +37,7 @@ echo "ARCH=%{_target_cpu}" >> chroot/.builderrc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/home/users/builder/{.requests,bin} \
+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 \
        $RPM_BUILD_ROOT/etc/cron.d
 
@@ -52,6 +52,15 @@ install chroot/.rpmrc.%{_target_cpu} $RPM_BUILD_ROOT/home/users/builder/chroot-%
 %endif
 install chroot/bin/* $RPM_BUILD_ROOT/home/users/builder/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
+#!/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
+
 install cron/builder $RPM_BUILD_ROOT/etc/cron.d/
 
 %pre
@@ -73,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(600,builder,builder,700)
 %attr(640,root,root) /etc/cron.d/builder
 %dir /home/users/builder
-%dir /home/users/builder/.requests
+%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