OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Sep-2007 17:33:53
Branch: HEAD Handle: 2007090916335200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
print entire list of all %NoSource files instead of bailing out on the
first missing file encountered
Summary:
Revision Changes Path
1.473 +1 -0 openpkg-src/openpkg/HISTORY
1.608 +1 -1 openpkg-src/openpkg/openpkg.spec
1.83 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.472 -r1.473 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Aug 2007 12:29:48 -0000 1.472
+++ openpkg-src/openpkg/HISTORY 9 Sep 2007 15:33:52 -0000 1.473
@@ -2,6 +2,7 @@
2007
====
+20070909 print entire list of all %NoSource files instead of bailing out on
the first missing file encountered
20070321 upgrade to openpkg-registry 1.1.3 remove legacy code which had the
side effect of the REGISTRY_UUID file being touched hourly
20070718 "diff reduction" to RPM 5 development version (no functional change)
20070717 fix a very long-standing cruel implementation bug in the platform
detection
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.607 -r1.608 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Aug 2007 12:29:48 -0000 1.607
+++ openpkg-src/openpkg/openpkg.spec 9 Sep 2007 15:33:52 -0000 1.608
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070824
+%define V_openpkg 20070909
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.82 -r1.83 rpmmacros
--- openpkg-src/openpkg/rpmmacros 19 Apr 2007 10:41:52 -0000 1.82
+++ openpkg-src/openpkg/rpmmacros 9 Sep 2007 15:33:52 -0000 1.83
@@ -333,7 +333,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
"set +x"; ( 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_nosource() %(%{l_sane_env}; checkok=1; checkinfo=`echo "Sorry,
this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo
"Before you can proceed building this package, fetch missing files MANUALLY:"`;
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="(unknown location) "; file="\\1":'
-e 's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file"
]; then checkok=0; checkinfo=`echo "${checkinfo}"; echo ""; echo "from ${url}";
echo "file ${file}"; echo "here %{_sourcedir}/$file"`; fi; done; if [ $checkok
-ne 1 ]; then echo "set +x"; echo "$checkinfo" | %{l_rpmtool} msg -b -t error |
sed -e 's;^;echo ";' -e 's;$;";'; echo "exit 1"; fi)
%l_check_class() %(%{l_sane_env}; class=`echo
"@:%{?class}:%{?distribution}" | sed -e 's;^@:\\([^:][^:]*\\):.*$;\\1;' -e
's;^@:.*\\[\\(.*\\)\\].*$;\\1;' -e 's;^@:.*$;JUNK;'`; %{l_rpmtool} check-class
"$class")
%prep %%prep\
%{l_check_nosource} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
