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: 14-Feb-2004 18:39:12
Branch: HEAD Handle: 2004021417391100
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
use sane build environment already in pre-expanded sanity checking
macros
Summary:
Revision Changes Path
1.133 +1 -0 openpkg-src/openpkg/HISTORY
1.288 +1 -1 openpkg-src/openpkg/openpkg.spec
1.57 +2 -2 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.132 -r1.133 HISTORY
--- openpkg-src/openpkg/HISTORY 13 Feb 2004 21:17:48 -0000 1.132
+++ openpkg-src/openpkg/HISTORY 14 Feb 2004 17:39:11 -0000 1.133
@@ -2,6 +2,7 @@
2004
====
+20040214 use sane build environment already in pre-expanded sanity checking macros
20040213 upgraded to OSSP uuid 0.9.7
20040212 added support to RPM's %patch macro for passing through patch(1) "-d"
option
20040212 upgraded to the latest GNU shtool 2.0b0 snapshot version
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.287 -r1.288 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 13 Feb 2004 21:17:48 -0000 1.287
+++ openpkg-src/openpkg/openpkg.spec 14 Feb 2004 17:39:11 -0000 1.288
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040213
+%define V_openpkg 20040214
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.56 -r1.57 rpmmacros
--- openpkg-src/openpkg/rpmmacros 10 Feb 2004 16:18:52 -0000 1.56
+++ openpkg-src/openpkg/rpmmacros 14 Feb 2004 17:39:11 -0000 1.57
@@ -321,8 +321,8 @@
%integrity() %{l_check_nosource}
# macros for checking build environment
-%l_check_nosource() %(for url in . %{?_restricted}; do [ ".$url" = .. ] &&
continue; eval `echo "$url" | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 -->
\\"; file=\\"\\2\\"!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\";
file=\\"\\2\\"!' -e 's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e
's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then (
echo "Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file.";
echo "Before you can proceed building this package you have to MANUALLY fetch"; echo "
${url}${file}"; echo "and provide it locally under the path"; echo "
%{_sourcedir}/$file" ) | %{l_rpmtool} msg -b -t error; echo "exit 1"; fi; done)
-%l_check_class() %(class=`echo "%{?class}" | sed -e 's;^$;JUNK;'`;
%{l_rpmtool} check-class "$class")
+%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
".$url" = .. ] && continue; eval `echo "$url" | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> \\"; file=\\"\\2\\"!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e
's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 's:^;::'`; if [ !
-f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then ( echo "Sorry, this
OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo "Before you can
proceed building this package you have to MANUALLY fetch"; echo " ${url}${file}";
echo "and provide it locally under the path"; echo " %{_sourcedir}/$file" ) |
%{l_rpmtool} msg -b -t error; echo "exit 1"; fi; done)
+%l_check_class() %(%{l_sane_env}; class=`echo "%{?class}" | sed -e
's;^$;JUNK;'`; %{l_rpmtool} check-class "$class")
%prep %%prep\
%{l_check_nosource} \
%{l_check_class} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
