OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Apr-2004 22:10:56
Branch: HEAD Handle: 2004040121105500
Modified files:
openpkg-src/openpkg HISTORY install.sh openpkg.spec
Log:
fix 'openpkg install openpkg-tool' bootstrapping command
Summary:
Revision Changes Path
1.151 +1 -0 openpkg-src/openpkg/HISTORY
1.2 +11 -7 openpkg-src/openpkg/install.sh
1.306 +1 -1 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.150 -r1.151 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Mar 2004 16:25:43 -0000 1.150
+++ openpkg-src/openpkg/HISTORY 1 Apr 2004 20:10:55 -0000 1.151
@@ -2,6 +2,7 @@
2004
====
+20040401 fix "openpkg install openpkg-tool" bootstrapping command
20040324 fix %l_check_nosource: the output went directly into the shell scripts
20040320 upgrade to cURL 7.11.1
20040320 bump provide for 2.0.0-2.0.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 install.sh
--- openpkg-src/openpkg/install.sh 16 Feb 2004 21:06:51 -0000 1.1
+++ openpkg-src/openpkg/install.sh 1 Apr 2004 20:10:55 -0000 1.2
@@ -1,3 +1,4 @@
[EMAIL PROTECTED]@/lib/openpkg/bash
##
## install -- OpenPKG Tool Chain "install" command (BOOSTRAP VERSION ONLY)
## Copyright (c) 2004 The OpenPKG Project <http://www.openpkg.org/>
@@ -32,11 +33,11 @@
if [ $# -eq 1 -a ".$1" = ".openpkg-tools" ]; then
:
else
- echo "openpkg:ERROR: still not available functionality \"$cmd $*\""
1>&2
- echo "openpkg: This functionality is provided by the \"openpkg-tools\" package
only!" 1>&2
- echo "openpkg: Run the command \"$OPENPKG_PREFIX/bin/openpkg install
openpkg-tools\" to" 1>&2
- echo "openpkg: bootstrap the \"openpkg-tools\" package for additional
functionality." 1>&2
- echo "openpkg: This bootstrap version only supports this particular install
command." 1>&2
+ echo "openpkg:ERROR: still not available functionality \"install $*\""
1>&2
+ echo "openpkg:INFO: This functionality is provided by the \"openpkg-tools\"
package only!" 1>&2
+ echo "openpkg:INFO: Run the command \"$OPENPKG_PREFIX/bin/openpkg install
openpkg-tools\" to" 1>&2
+ echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for additional
functionality." 1>&2
+ echo "openpkg:INFO: This bootstrap version only supports this particular
install command." 1>&2
exit 1
fi
@@ -72,7 +73,10 @@
fi
pkg_name=`$OPENPKG_PREFIX/lib/openpkg/curl -s -l "$url/" |\
egrep "^${pkg}-[0-9]" |\
- sed -e
"s;^${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" |\
+ sed -e "s;^;X;" \
+ -e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" \
+ -e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.sh.*;\\2:\\1;" \
+ -e "s;^X.*;;" |\
sort -r | head -1 |\
sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
if [ ".$pkg_name" != . ]; then
@@ -90,7 +94,7 @@
fi
# check whether package is already installed
- if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not
installed'`" != . ]; the
+ if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not
installed'`" != . ]; then
continue
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.305 -r1.306 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Mar 2004 16:25:43 -0000 1.305
+++ openpkg-src/openpkg/openpkg.spec 1 Apr 2004 20:10:55 -0000 1.306
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040324
+%define V_openpkg 20040401
# the used software versions
%define V_rpm 4.2.1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
