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:48:08 Branch: HEAD Handle: 2004032416480800 Modified files: openpkg-src/openpkg rpmmacros Log: add set +x to shut up displaying the echos Summary: Revision Changes Path 1.61 +1 -1 openpkg-src/openpkg/rpmmacros ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmmacros ============================================================================ $ cvs diff -u -r1.60 -r1.61 rpmmacros --- openpkg-src/openpkg/rpmmacros 24 Mar 2004 16:25:43 -0000 1.60 +++ openpkg-src/openpkg/rpmmacros 24 Mar 2004 16:48:08 -0000 1.61 @@ -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 | sed -e 's;^;echo ";' -e 's;$;";'; 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 "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_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]