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: 24-Mar-2004 17:25:43
Branch: HEAD Handle: 2004032416254300
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
fix %l_check_nosource: the output went directly into the shell scripts
Summary:
Revision Changes Path
1.150 +1 -0 openpkg-src/openpkg/HISTORY
1.305 +1 -1 openpkg-src/openpkg/openpkg.spec
1.60 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.149 -r1.150 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Mar 2004 07:47:14 -0000 1.149
+++ openpkg-src/openpkg/HISTORY 24 Mar 2004 16:25:43 -0000 1.150
@@ -2,6 +2,7 @@
2004
====
+20040324 fix %l_check_nosource: the output went directly into the shell scripts
20040320 upgrade to cURL 7.11.1
20040320 bump provide for 2.0.0-2.0.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.304 -r1.305 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 20 Mar 2004 07:47:14 -0000 1.304
+++ openpkg-src/openpkg/openpkg.spec 24 Mar 2004 16:25:43 -0000 1.305
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040320
+%define V_openpkg 20040324
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.59 -r1.60 rpmmacros
--- openpkg-src/openpkg/rpmmacros 16 Feb 2004 21:06:51 -0000 1.59
+++ openpkg-src/openpkg/rpmmacros 24 Mar 2004 16:25:43 -0000 1.60
@@ -325,7 +325,7 @@
%integrity() %{l_check_nosource}
# macros for checking build environment
-%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_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 | sed -e 's;^;echo ";' -e 's;$;";'; 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} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
