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 09:32:17
Branch: HEAD Handle: 2006062208321301
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
do not rely on the smartness of RPM to not expand "%x" when we
actually meant "%%x"
Summary:
Revision Changes Path
1.340 +1 -0 openpkg-src/openpkg/HISTORY
1.493 +1 -1 openpkg-src/openpkg/openpkg.spec
1.76 +5 -5 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.339 -r1.340 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Jun 2006 15:21:04 -0000 1.339
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 07:32:13 -0000 1.340
@@ -2,6 +2,7 @@
2006
====
+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
20060621 added "openpkg release" command for more precise OpenPKG
distribution tag and URL determination
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.492 -r1.493 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Jun 2006 15:21:04 -0000 1.492
+++ openpkg-src/openpkg/openpkg.spec 22 Jun 2006 07:32:13 -0000 1.493
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060621
+%define V_openpkg 20060622
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.75 -r1.76 rpmmacros
--- openpkg-src/openpkg/rpmmacros 21 Jun 2006 15:21:05 -0000 1.75
+++ openpkg-src/openpkg/rpmmacros 22 Jun 2006 07:32:14 -0000 1.76
@@ -26,7 +26,7 @@
##
# the OpenPKG release identification (for the current package or as a
fallback for the bootstrap package)
-%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release="%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}"
%{?-F:-F "%(echo "%{-F*}" | sed -e 's/%s/%t/g')"}%{!?-F:-F "OpenPKG-%t"})
+%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release="%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}"
%{?-F:-F "%(echo "%{-F*}" | sed -e 's/%%s/%%t/g')"}%{!?-F:-F "OpenPKG-%%t"})
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ -42,8 +42,8 @@
%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')
-%l_tag_fmt_user %(%{l_shtool} echo -e '%u')
-%l_tag_fmt_host %(%{l_shtool} echo -e '%h%d')
+%l_tag_fmt_user %(%{l_shtool} echo -e '%%u')
+%l_tag_fmt_host %(%{l_shtool} echo -e '%%h%%d')
%l_tag_gen %{expand:%(echo '%{l_tag_fmt}' | sed -e
's/<\\([a-zA-Z][_a-zA-Z0-9]*\\)>/%%{l_tag_fmt_\\1}/g')}
%l_tag %(echo "%{l_tag_gen}" | sed -e 's;-;;g')
@@ -281,9 +281,9 @@
%l_whoami %((id -un) 2>/dev/null || (whoami) 2>/dev/null ||
(who am i | cut "-d " -f1) 2>/dev/null || echo $LOGNAME)
# macros for dynamically generating a %files list
-%l_files_defattr '%defattr(-,%{l_musr},%{l_mgrp})'
+%l_files_defattr '%%defattr(-,%{l_musr},%{l_mgrp})'
%l_files_all '%{l_prefix}'
-%l_files_noshared '%not %dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
+%l_files_noshared '%%not %%dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
%l_files_std() %l_files_defattr %l_files_all %l_files_noshared
# path to local build root
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
