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: 08-Jan-2003 15:29:11
Branch: HEAD Handle: 2003010814290901
Modified files:
openpkg-src/openpkg openpkg.spec rpmmacros
openpkg-web news.txt
Log:
add no-source support
Summary:
Revision Changes Path
1.122 +2 -2 openpkg-src/openpkg/openpkg.spec
1.28 +5 -0 openpkg-src/openpkg/rpmmacros
1.2599 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.121 -r1.122 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 3 Jan 2003 11:09:23 -0000 1.121
+++ openpkg-src/openpkg/openpkg.spec 8 Jan 2003 14:29:10 -0000 1.122
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20030103
-%define R_openpkg 20030103
+%define V_openpkg 20030108
+%define R_openpkg 20030108
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.27 -r1.28 rpmmacros
--- openpkg-src/openpkg/rpmmacros 3 Jan 2003 11:09:24 -0000 1.27
+++ openpkg-src/openpkg/rpmmacros 8 Jan 2003 14:29:10 -0000 1.28
@@ -199,6 +199,11 @@
%option() %{expand:%%{!?%{1}:%%global %*}} \
Provides: %{name}::%{1} = %(echo '%{expand:%%{%{1}}}' | sed -e 's;%%;%%%%;g' -e 's;
;%%20;g' -e 's; ;%%09;g')
+# macros for NoSource/NoPatch (distribution restriction) integrity handling
+%NoSource() %(if [ ".%{?restriction}" != ".no" ]; then echo "NoSource:
%1"; fi)%{expand:%%global _restricted %{?_restricted:%{_restricted}} %%{SOURCEURL%1}}
+%NoPatch() %(if [ ".%{?restriction}" != ".no" ]; then echo "NoPatch:
%1"; fi)%{expand:%%global _restricted %{?_restricted:%{_restricted}} %%{PATCHURL%1}}
+%integrity() %(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)
+
# macro-processor add-on for testing external conditions
%l_test(pfd) %(if [ ".%{?-p:yes}" = .yes ]; then %{l_prefix}/bin/rpm -q
%1 >/dev/null 2>&1; rc=$?; elif [ ".%{?-f:yes}" = .yes ]; then test -f %1; rc=$?; elif
[ ".%{?-d:yes}" = .yes ]; then test -d %1; rc=$?; fi; if [ ".$rc" = .0 ]; then echo
"yes"; else echo "no"; fi)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2598 -r1.2599 news.txt
--- openpkg-web/news.txt 8 Jan 2003 13:11:23 -0000 1.2598
+++ openpkg-web/news.txt 8 Jan 2003 14:29:09 -0000 1.2599
@@ -1,3 +1,4 @@
+08-Jan-2003: Upgraded package: P<openpkg-20030108-20030108>
08-Jan-2003: Upgraded package: P<pam-20030108-20030108>
08-Jan-2003: Upgraded package: P<vim-6.1.284-20030108>
08-Jan-2003: Upgraded package: P<ccache-2.1-20030108>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
