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:   16-Feb-2004 15:49:01
  Branch: HEAD                             Handle: 2004021614490001

  Modified files:
    openpkg-src/openpkg     HISTORY openpkg.boot openpkg.spec rpmmacros

  Log:
    fixed --tag processing in bootstrapping situation

  Summary:
    Revision    Changes     Path
    1.135       +1  -0      openpkg-src/openpkg/HISTORY
    1.46        +1  -0      openpkg-src/openpkg/openpkg.boot
    1.290       +1  -0      openpkg-src/openpkg/openpkg.spec
    1.58        +3  -2      openpkg-src/openpkg/rpmmacros
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.134 -r1.135 HISTORY
  --- openpkg-src/openpkg/HISTORY       16 Feb 2004 10:05:32 -0000      1.134
  +++ openpkg-src/openpkg/HISTORY       16 Feb 2004 14:49:00 -0000      1.135
  @@ -2,6 +2,7 @@
   2004
   ====
   
  +20040216 fixed --tag processing in bootstrapping situation
   20040216 upgraded to OSSP uuid 1.0.0
   20040214 use sane build environment already in pre-expanded sanity checking macros
   20040213 upgraded to OSSP uuid 0.9.7
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.boot
  ============================================================================
  $ cvs diff -u -r1.45 -r1.46 openpkg.boot
  --- openpkg-src/openpkg/openpkg.boot  9 Feb 2004 20:18:30 -0000       1.45
  +++ openpkg-src/openpkg/openpkg.boot  16 Feb 2004 14:49:00 -0000      1.46
  @@ -440,6 +440,7 @@
       -e "s;@NGRP@;$ngrp;" \
       -e "s;@TAG@;$tag;" \
       -e "s;\\(%{l_prefix}/lib/openpkg/rpmtool\\);%{l_bash} \\1;g" \
  +    -e "s;@l_prefix_static@;$prefix;g" \
       -e "s;@l_prefix@;$RPM_BUILD_ROOT$prefix;g" \
       -e "s;%l_prefix;%l_prefix_INTERNAL;g" \
       -e "s;%{l_prefix};%{l_prefix_INTERNAL};g" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.289 -r1.290 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  16 Feb 2004 10:05:32 -0000      1.289
  +++ openpkg-src/openpkg/openpkg.spec  16 Feb 2004 14:49:00 -0000      1.290
  @@ -983,6 +983,7 @@
           <`SOURCE rpmrc` \
           >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/rpmrc
       sed -e "s:@l_prefix@:%{l_prefix}:g" \
  +        -e "s:@l_prefix_static@:%{l_prefix}:g" \
           -e "s;@l_build_path@;$l_build_path;g" \
           -e "s;@l_build_ldlp@;$l_build_ldlp;g" \
           -e "s;@l_build_ulim@;$l_build_ulim;g" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpmmacros
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 rpmmacros
  --- openpkg-src/openpkg/rpmmacros     14 Feb 2004 17:39:11 -0000      1.57
  +++ openpkg-src/openpkg/rpmmacros     16 Feb 2004 14:49:01 -0000      1.58
  @@ -38,8 +38,8 @@
   
   #   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_compat        %(prefix="%{l_prefix_static}"; 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_static}" | 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)
   %l_tag_fmt_time          %(date '+%%Y%%m%%d%%H%%M%%S')
  @@ -131,6 +131,7 @@
   
   #   define the installation hierarchy (used parts)
   %l_prefix                @l_prefix@
  +%l_prefix_static         @l_prefix_static@
   
   #   define the installation hierarchy (unused parts)
   %l_exec_prefix           %{l_prefix}
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to