ooo-build r13532 - in trunk: . scratch/split src

[pmladek svn gnome org]

Author: pmladek
Date: Tue Aug 12 19:09:13 2008
New Revision: 13532
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13532&view=rev

Log:
2008-08-12  Petr Mladek  <pmladek suse cz>

	* scratch/split/rpmbuild: allow to switch architecture more easily

	* src/setup_native_packinfo-m25.tar.bz2: add the scsolver stuff



Modified:
   trunk/ChangeLog
   trunk/scratch/split/rpmbuild
   trunk/src/setup_native_packinfo-m25.tar.bz2

Modified: trunk/scratch/split/rpmbuild
==============================================================================
--- trunk/scratch/split/rpmbuild	(original)
+++ trunk/scratch/split/rpmbuild	Tue Aug 12 19:09:13 2008
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export ARCH=i586
 export PATH="/opt/icecream/bin:$PATH"
 modules="bootstrap ure libs_extern artwork libs_gui libs_core components l10n impress writer calc base filters %%"
 if test "z$1" != "z"; then
@@ -21,8 +22,8 @@
     fi
     sudo bash -l -c "/usr/bin/rpmbuild --eval '%define jobs 8' -ba SPECS/ooo3$suffix.spec" || exit 1
     echo "Installing $module RPM(s)"
-    sudo rpm -U --force RPMS/i586/ooo3$suffix-$verstr.i586.rpm || exit 1
-    if test -f RPMS/i586/ooo3$suffix-devel-$verstr.i586.rpm; then
-        sudo rpm -U --force RPMS/i586/ooo3$suffix-devel-$verstr.i586.rpm || exit 1
+    sudo rpm -U --force RPMS/$ARCH/ooo3$suffix-$verstr.$ARCH.rpm || exit 1
+    if test -f RPMS/$ARCH/ooo3$suffix-devel-$verstr.$ARCH.rpm; then
+        sudo rpm -U --force RPMS/$ARCH/ooo3$suffix-devel-$verstr.$ARCH.rpm || exit 1
     fi
 done

Modified: trunk/src/setup_native_packinfo-m25.tar.bz2
==============================================================================
Binary files. No diff available.