OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jul-2002 14:50:57
Branch: HEAD Handle: 2002071413505700
Modified files:
openpkg-src/openpkg openpkg.spec rpmmacros
Log:
add support for directly finding local tool copies
Summary:
Revision Changes Path
1.82 +2 -2 openpkg-src/openpkg/openpkg.spec
1.15 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
Index: openpkg-src/openpkg/openpkg.spec
============================================================
$ cvs diff -u -r1.81 -r1.82 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 25 Jun 2002 08:55:54 -0000 1.81
+++ openpkg-src/openpkg/openpkg.spec 14 Jul 2002 12:50:57 -0000 1.82
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20020625
-%define R_openpkg 20020625
+%define V_openpkg 20020714
+%define R_openpkg 20020714
# the used software versions
%define V_rpm 4.0.2
Index: openpkg-src/openpkg/rpmmacros
============================================================
$ cvs diff -u -r1.14 -r1.15 rpmmacros
--- openpkg-src/openpkg/rpmmacros 5 Jun 2002 11:53:52 -0000 1.14
+++ openpkg-src/openpkg/rpmmacros 14 Jul 2002 12:50:57 -0000 1.15
@@ -139,7 +139,7 @@
%l_bash %{l_prefix}/lib/openpkg/bash
# provide smart paths to tools
-%l_tool_locate() %(if [ ".%{expand:%%{?with_%1}}" != . ]; then
tool="%{expand:%%{with_%1}}"; elif [ -f "%{l_bindir}/%1" ]; then
tool="%{l_bindir}/%1"; else tool="%1"; fi; echo $tool)
+%l_tool_locate() %(if [ ".%{expand:%%{?with_%1}}" != . ]; then
tool="%{expand:%%{with_%1}}"; elif [ -f "%{l_bindir}/%1" ]; then
tool="%{l_bindir}/%1"; elif [ -f "%{l_prefix}/lib/openpkg/%1" ]; then
tool="%{l_prefix}/lib/openpkg/%1"; else tool="%1"; fi; echo $tool)
%l_gzip %{l_tool_locate gzip}
%l_bzip2 %{l_tool_locate bzip2}
%l_tar %{l_tool_locate tar}
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
