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: 22-Jun-2006 10:01:40
Branch: HEAD Handle: 2006062209013700
Modified files:
openpkg-src/openpkg HISTORY openpkg.boot
Log:
replace release tag fiddling in openpkg.boot with "openpkg release"
functionality, too.
Summary:
Revision Changes Path
1.341 +1 -0 openpkg-src/openpkg/HISTORY
1.59 +3 -24 openpkg-src/openpkg/openpkg.boot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.340 -r1.341 HISTORY
--- openpkg-src/openpkg/HISTORY 22 Jun 2006 07:32:13 -0000 1.340
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 08:01:37 -0000 1.341
@@ -2,6 +2,7 @@
2006
====
+20060622 replace release tag fiddling in openpkg.boot with "openpkg release"
functionality, too.
20060622 do not rely on RPM's smartness to not expand "%x" when we actually
meant "%%x"
20060621 use new "openpkg release" for "openpkg install" and "openpkg build"
commands
20060621 use new "openpkg release" for %{l_openpkg_release} macro
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.58 -r1.59 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 12 May 2006 14:35:05 -0000 1.58
+++ openpkg-src/openpkg/openpkg.boot 22 Jun 2006 08:01:37 -0000 1.59
@@ -194,18 +194,7 @@
sh $tmpdir/.sh
rm -f $tmpdir/.sh
l_version="$release"
- case "${l_version}" in
- [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
- l_release="CURRENT"
- ;;
- * )
- l_release=`echo "${l_version}" |\
- sed -e 's;^;#;' \
- -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
- -e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
- -e 's;^#.*;UNKNOWN;'`
- ;;
- esac
+ l_release=`sh ./release.sh -r "${l_version}" -F "%t"`
sed <$srcdir/aux.wrapsrc.sh >$tmpdir/openpkg.boot.tmp \
-e "s;@l_dir@;$name-$version-$release.src;" \
-e "s;@l_release@;$l_release;" \
@@ -524,18 +513,8 @@
$RPM_BUILD_ROOT$prefix/openpkg.bzip2
l_platform=`$tmpdir/rpm --eval '%{l_platform -p}'`
l_version=`$tmpdir/rpm -q --qf '%{version}' openpkg`
-case "${l_version}" in
- [0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
- l_release="CURRENT"
- ;;
- * )
- l_release=`echo "${l_version}" |\
- sed -e 's;^;#;' \
- -e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
- -e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
- -e 's;^#.*;UNKNOWN;'`
- ;;
-esac
+release_sh=`SOURCE release.sh`
+l_release=`sh $release_sh -r "$l_version" -F "%t"`
cat $spec |\
sed -e "/^%pre$/,/^%/ p" -e 'd' |\
sed -e '/^%/d' -e 's/^ //' |\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
