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: 10-Feb-2004 17:18:53
Branch: HEAD Handle: 2004021016185200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
use "<compat>" for "%l_tag_fmt" on upgrades to be more OpenPKG 1.3
compatible
Summary:
Revision Changes Path
1.128 +1 -0 openpkg-src/openpkg/HISTORY
1.284 +1 -1 openpkg-src/openpkg/openpkg.spec
1.56 +1 -0 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.127 -r1.128 HISTORY
--- openpkg-src/openpkg/HISTORY 10 Feb 2004 15:19:34 -0000 1.127
+++ openpkg-src/openpkg/HISTORY 10 Feb 2004 16:18:52 -0000 1.128
@@ -2,6 +2,7 @@
2004
====
+20040210 use "<compat>" for "%l_tag_fmt" on upgrades to be more OpenPKG 1.3
compatible
20040210 we more smart and accept not-existing "Class:" headers for compatibility.
20040209 cleanup "rpmmacros" for consistent "%l_prefix" usage and fix "rpmtool not
found" issue
20040208 added version tracking for OSSP uuid
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.283 -r1.284 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 10 Feb 2004 15:19:34 -0000 1.283
+++ openpkg-src/openpkg/openpkg.spec 10 Feb 2004 16:18:52 -0000 1.284
@@ -369,7 +369,7 @@
if [ ".%{?l_tag_fmt:set}" = .set ]; then
tag="%{l_tag_fmt}"
else
- tag="<loc>"
+ tag="<compat>"
fi
echo "tag=\"$tag\"; export tag" >>.buildenv
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.55 -r1.56 rpmmacros
--- openpkg-src/openpkg/rpmmacros 10 Feb 2004 15:19:34 -0000 1.55
+++ openpkg-src/openpkg/rpmmacros 10 Feb 2004 16:18:52 -0000 1.56
@@ -38,6 +38,7 @@
# the OpenPKG package tagging
%l_tag_fmt @TAG@
+%l_tag_fmt_compat %(prefix="%{l_prefix}"; if [ ".`expr $prefix :
'/[^/][^/]*$'`" != .0 ]; then loc=`echo $prefix | cut -c2-4`; else loc=`echo $prefix |
sed -e 's;/\\(.\\)[^/]*;\\1;g' | cut -c1-3`; fi; echo $loc)
%l_tag_fmt_loc %(echo "%{l_prefix}" | sed -e
's;^/\\([^/]\\)[^/]*/\\([^/]\\)[^/]*/\\([^/]\\).*;\\1\\2\\3;' -e
's;^/\\([^/]\\)[^/]*/\\([^/][^/]\\).*;\\1\\2;' -e
's;^/\\([^/][^/]\\)[^/]*/\\([^/]\\).*;\\1\\2;' -e
's;^/\\([^/]\\)[^/]*/\\([^/]\\).*;\\1\\2;' -e 's;^/\\([^/][^/][^/]\\).*;\\1;' -e
's;^/\\([^/][^/]\\).*;\\1;' -e 's;^/\\([^/]\\).*;\\1;')
%l_tag_fmt_opt %(uuid_ns="`%{l_uuid} -v3 ns:OID
%{l_openpkg_oid_tagfmtopt}`"; %{l_uuid} -v3 $uuid_ns '%{?_options}')
%l_tag_fmt_uuid %(%{l_uuid} -v1)
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
