OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Aug-2006 08:54:43
Branch: HEAD Handle: 2006082307544201
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec release.sh
Log:
- upgrade to openpkg-tools 0.8.69 (no longer uses "curl -q" in "openpkg
build")
- fix "openpkg release" with workaround for Solaris sed(1) which ignores
lines without trailing newlines
Summary:
Revision Changes Path
1.360 +3 -0 openpkg-src/openpkg/HISTORY
1.512 +2 -2 openpkg-src/openpkg/openpkg.spec
1.2 +3 -3 openpkg-src/openpkg/release.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.359 -r1.360 HISTORY
--- openpkg-src/openpkg/HISTORY 18 Aug 2006 13:17:10 -0000 1.359
+++ openpkg-src/openpkg/HISTORY 23 Aug 2006 06:54:42 -0000 1.360
@@ -2,6 +2,9 @@
2006
====
+20060823 upgrade to openpkg-tools 0.8.69 (no longer uses "curl -q" in
"openpkg build")
+20060823 fix "openpkg release" with workaround for Solaris sed(1) which
ignores lines without trailing newlines
+
20060818 **** RELEASE AS PART OF OPENPKG 2.20060818 ***
20060818 upgrade to openpkg-tools 0.8.68
20060818 try to workaround "grep -e" Autoconf issues on Solaris with OSSP
uuid.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.511 -r1.512 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 18 Aug 2006 13:17:10 -0000 1.511
+++ openpkg-src/openpkg/openpkg.spec 23 Aug 2006 06:54:42 -0000 1.512
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060818
+%define V_openpkg 20060823
# the used software versions
%define V_rpm 4.2.1
@@ -56,7 +56,7 @@
%define V_registry 0.7.2
%define V_perl 5.8.8
%define V_openssl 0.9.8b
-%define V_tools 0.8.68
+%define V_tools 0.8.69
# package information
Name: openpkg
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 release.sh
--- openpkg-src/openpkg/release.sh 21 Jun 2006 15:21:05 -0000 1.1
+++ openpkg-src/openpkg/release.sh 23 Aug 2006 06:54:43 -0000 1.2
@@ -71,13 +71,13 @@
if [ ".$opt_r" != . ]; then
tag=`echo ".$opt_r" | sed -e 's;^\.;;' | number_to_tag`
elif [ -f "$prefix/etc/openpkg/release" ]; then
- tag=`sed <$prefix/etc/openpkg/release \
+ tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
-e '/^X/d'`
else
tag=`$prefix/bin/openpkg rpm \
- -q --qf '%{VERSION}' openpkg | number_to_tag`
+ -q --qf '%{VERSION}\n' openpkg | number_to_tag`
fi
if [ .`echo ".$tag" | sed -e 's;^\.;;' | tag_sanity` = .ERROR ]; then
echo "openpkg:release: WARNING: unable to determine OpenPKG release tag"
1>&2
@@ -87,7 +87,7 @@
# determine distribution URL
url=""
if [ -f "$prefix/etc/openpkg/release" ]; then
- url=`sed <$prefix/etc/openpkg/release \
+ url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
-e '/^X/d'`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
