thomas: server install-kolab.sh, 1.31, 1.32 release-notes.txt, 1.269, 1.270

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30986

Modified Files:
	install-kolab.sh release-notes.txt 
Log Message:
Fix kolab/issue2747 (Installation of ix86 binaries fails on amd64 system)

Determine the platform from the installed openpkg package instead of the system.


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- install-kolab.sh	26 May 2008 14:49:25 -0000	1.31
+++ install-kolab.sh	5 Jun 2008 14:07:42 -0000	1.32
@@ -155,8 +155,15 @@
                 exit 0
             fi
         elif [ -n "$FLAG_INDEX" ]; then
-            PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
-            exec $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG .
+            BINARY=`find . -mindepth 1 -maxdepth 1 -name "openpkg-2*.rpm" \! -name "openpkg-*.src.rpm" -print`
+            if [ -z "$BINARY" ]; then
+                echo "Generating 00INDEX.rdf for source distribution ..."
+                exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -i .
+            else
+                PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG
+                echo "Generating 00INDEX.rdf for binary ($PLATTAG) distribution ..."
+                exec "$PREFIX/bin/openpkg" index -r . -o 00INDEX.rdf -i -p $PLATTAG .
+            fi
         else
             echo "\"$PREFIX\" seems to be no OpenPKG environment."
             exit 1
@@ -258,7 +265,7 @@
 fi
 
 if [ -n "$DIR" ]; then
-    [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
+    [ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/bin/openpkg" rpm -q --qf="%{ARCH}-%{OS}" openpkg`-$TAG
     if [ -n "$KOLAB_VERSION" ]; then
         DEFINE="$DEFINE
             -Dkolabd::kolab_version=$KOLAB_VERSION

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- release-notes.txt	2 Jun 2008 15:43:34 -0000	1.269
+++ release-notes.txt	5 Jun 2008 14:07:42 -0000	1.270
@@ -50,6 +50,8 @@
 
 	Adjusted version number.
 
+	kolab/issue2747 (Installation of ix86 binaries fails on amd64 system)
+
     - kolabconf-2.2.0-2008????
 
 	Adjusted version number.