- make --prefix optional in aux.wrapsrc.sh and default to /openpkg - let the --susr/--sgrp default to "root" only if --user/--group was specified - emulate GNU libtool environment for bzip2 to make sure RPM picks it up before a vendor version - fix final install detection in "openpkg install" command

openpkg/HISTORY

@@ -2,6 +2,10 @@
 2004
 ====
 
+20040712 make --prefix optional in aux.wrapsrc.sh and default to /openpkg
+20040712 let the --susr/--sgrp default to "root" only if --user/--group was specified
+20040712 emulate GNU libtool environment for bzip2 to make sure RPM picks it up before a vendor version
+20040712 fix final install detection in "openpkg install" command
 20040702 reorder and split building of tools in order to already unpack problematic cURL tarball with GNU tar
 20040702 make sure $PATH contains at least "/bin:/sbin:/usr/bin:/usr/sbin" for bootstrapping
 20040702 upgrade to GNU shtool 2.0.0

openpkg/aux.usrgrp.sh

@@ -89,7 +89,11 @@ cgrp=`(id -gn $cusr) 2>/dev/null ||\
 
 #   determine OpenPKG susr/sgrp
 if [ ".$susr" = . ]; then
-    susr="root"
+    if [ ".$usr" = . ]; then
+        susr="$cusr"
+    else
+        susr="root"
+    fi
 fi
 if [ ".$sgrp" = . ]; then
     sgrp=`(id -gn $susr) 2>/dev/null`

openpkg/aux.wrapsrc.sh

@@ -29,7 +29,7 @@ l_me="$0"
 o_help=no
 o_version=no
 o_tar=no
-l_prefix=''
+l_prefix='/openpkg'
 l_dir='@l_dir@'
 l_release="@l_release@"
 l_version="@l_version@"
@@ -54,9 +54,6 @@ do
         --prefix=*      ) l_prefix=$arg ;;
     esac
 done
-if [ ".$o_version" = .no ] && [ ".$o_tar" = .no ] && [ ".$l_prefix" = . ]; then
-    o_help=yes
-fi
 if [ ".$o_help" = .yes ]; then
     echo "Usage: sh $l_me" 2>&1
     echo "       [--prefix=<prefix>]" 2>&1

openpkg/install.sh

@@ -122,7 +122,7 @@ for pkg in openpkg make binutils gcc perl openpkg-tools; do
 done
 
 #   display final result message
-if [ -f "$OPENPKG_PREFIX/lib/openpkg-tools/openpkg.sh" ]; then
+if [ -d "$OPENPKG_PREFIX/lib/openpkg-tools" ]; then
     ( echo "Congratulations, you have bootstrapped the OpenPKG Tool Chain."
       echo "You now have additional management ommands available. Run"
       echo "    \$ $OPENPKG_PREFIX/bin/openpkg --help"

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040702
+%define       V_openpkg  20040712
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -582,6 +582,21 @@ Provides:     openpkg = 2.0.3-2.0.3
     #   build BZIP2 library
     ( cd bzip2-%{V_bzip2}
       ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
+      ( echo "# libbz2.la - a libtool library file"
+        echo "# Generated by ltmain.sh - GNU libtool x.x.x"
+        echo "dlname=''"
+        echo "library_names=''"
+        echo "old_library='libbz2.a'"
+        echo "dependency_libs=''"
+        echo "current=0"
+        echo "age=0"
+        echo "revision=0"
+        echo "installed=no"
+        echo "dlopen=''"
+        echo "dlpreopen=''"
+        echo "libdir='%{l_prefix}'"
+      ) >libbz2.la
+      ln -s . .libs
     ) || exit $?
 
     #   display verbosity header