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-Aug-2005 10:13:51
Branch: HEAD Handle: 2005080909135100
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
make sure strip(1) logic does not break shell script execution
Summary:
Revision Changes Path
1.285 +1 -0 openpkg-src/openpkg/HISTORY
1.439 +2 -2 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.284 -r1.285 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Aug 2005 18:40:39 -0000 1.284
+++ openpkg-src/openpkg/HISTORY 9 Aug 2005 08:13:51 -0000 1.285
@@ -2,6 +2,7 @@
2005
====
+20050808 make sure strip(1) logic does not break shell script execution
20050804 temporary workaround defeating problems with Fedora Core 4 vendor
compiler
20050727 remove dependency to binutils tools size(1) and strip(1)
20050727 added to rpmtool the detection for "number of CPUs" under AIX for
"make -j"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.438 -r1.439 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Aug 2005 18:40:39 -0000 1.438
+++ openpkg-src/openpkg/openpkg.spec 9 Aug 2005 08:13:51 -0000 1.439
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050805
+%define V_openpkg 20050809
# the used software versions
%define V_rpm 4.2.1
@@ -851,7 +851,7 @@
# manually make sure strip(1) is available or use a null replacement
l_strip=""; [ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}";
export l_strip
if [ ".$l_strip" = . ]; then
- l_strip=`sh $shtool path strip`
+ l_strip=`sh $shtool path strip || true`
if [ ".$l_strip" = . ]; then
echo "openpkg: prerequisite tool \`strip' not found - using null
replacement"
l_strip="echo"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
