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: 04-Feb-2007 21:12:56
Branch: HEAD Handle: 2007020420125500
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmtool
Log:
unbreak rpmtool cflags tool detection
Summary:
Revision Changes Path
1.422 +1 -0 openpkg-src/openpkg/HISTORY
1.562 +1 -1 openpkg-src/openpkg/openpkg.spec
1.52 +4 -2 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.421 -r1.422 HISTORY
--- openpkg-src/openpkg/HISTORY 30 Jan 2007 17:36:29 -0000 1.421
+++ openpkg-src/openpkg/HISTORY 4 Feb 2007 20:12:55 -0000 1.422
@@ -2,6 +2,7 @@
2007
====
+20070204 unbreak rpmtool cflags tool detection
20070130 minor fixes in rpmtool and the corresponding man page
20070130 upgrade to cURL 7.16.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.561 -r1.562 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 30 Jan 2007 08:34:29 -0000 1.561
+++ openpkg-src/openpkg/openpkg.spec 4 Feb 2007 20:12:55 -0000 1.562
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070130
+%define V_openpkg 20070204
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.51 -r1.52 rpmtool
--- openpkg-src/openpkg/rpmtool 30 Jan 2007 13:15:42 -0000 1.51
+++ openpkg-src/openpkg/rpmtool 4 Feb 2007 20:12:55 -0000 1.52
@@ -450,11 +450,13 @@
cflags )
tool="$1"
- isgcc=no
- if [ ! -x "$tool" -o -d "$tool" ]; then
+ shtool=`echo $prog_path | sed -e 's;/[^/]*$;/shtool;'`
+ sh $shtool path --suppress $tool
+ if [ $? -ne 0 ]; then
echo "$msgprefix:Error: specified tool \`$tool' not found or not
executable" 1>&2
exit 1
fi
+ isgcc=no
if [ ".`($tool -v; $tool --version) </dev/null 2>&1 | grep -i
'gcc'`" != . ]; then
isgcc=yes
fi
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
