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 openpkg-web Date: 02-Jan-2004 16:53:01
Branch: HEAD Handle: 2004010215525802
Modified files:
openpkg-src/openpkg openpkg.spec rpmmacros
openpkg-web news.txt
Log:
make sure rpmtool exists (important on bootstrapping with
openpkg.boot)
Summary:
Revision Changes Path
1.258 +1 -1 openpkg-src/openpkg/openpkg.spec
1.48 +1 -1 openpkg-src/openpkg/rpmmacros
1.7944 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.257 -r1.258 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 1 Jan 2004 19:19:07 -0000 1.257
+++ openpkg-src/openpkg/openpkg.spec 2 Jan 2004 15:53:00 -0000 1.258
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040101
+%define V_openpkg 20040102
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.47 -r1.48 rpmmacros
--- openpkg-src/openpkg/rpmmacros 13 Dec 2003 21:55:01 -0000 1.47
+++ openpkg-src/openpkg/rpmmacros 2 Jan 2004 15:53:00 -0000 1.48
@@ -298,7 +298,7 @@
%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 1>&2; echo "exit 1"; fi; done)
+%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" ) | (if [ -f %{l_rpmtool} ]; then %{l_rpmtool} msg -b -t error;
fi) 1>&2; echo "exit 1"; fi; done)
%l_check_class() %(class=`echo "%{distribution}" | sed -e 's;^;X;' -e
's;^X.*\\[\\(..*\\)\\].*$;\\1;' -e 's;^X.*;JUNK;'`; %{l_rpmtool} check-class "$class")
%prep %%prep\
%{l_check_nosource} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7943 -r1.7944 news.txt
--- openpkg-web/news.txt 2 Jan 2004 09:15:54 -0000 1.7943
+++ openpkg-web/news.txt 2 Jan 2004 15:52:58 -0000 1.7944
@@ -1,3 +1,4 @@
+02-Jan-2004: Upgraded package: P<openpkg-20040102-20040102>
02-Jan-2004: Upgraded package: P<postgresql-7.4.1-20040102>
02-Jan-2004: Upgraded package: P<rsync-2.6.0-20040102>
02-Jan-2004: New package: P<ldapvi-1.0-20040102>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
