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 openpkg-web Date: 06-Jun-2003 14:13:27
Branch: HEAD Handle: 2003060613132402
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
openpkg-web news.txt
Log:
correctly support use_cxx for setting the c++ path
Summary:
Revision Changes Path
1.5 +1 -0 openpkg-src/openpkg/HISTORY
1.165 +1 -1 openpkg-src/openpkg/openpkg.spec
1.34 +18 -18 openpkg-src/openpkg/rpmmacros
1.4755 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.4 -r1.5 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Jun 2003 15:21:07 -0000 1.4
+++ openpkg-src/openpkg/HISTORY 6 Jun 2003 12:13:26 -0000 1.5
@@ -2,6 +2,7 @@
2003
====
+20030606 correctly support "use_cxx" for setting the "c++" path
20030604 fix "{s,m,r,r}{u,g}id" handling on initial bootstrapping via .src.sh.
20030604 better support SuSE
20030603 make sure 'shtool install -e ...' does not fail if file is not writeable
due to permissions
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.164 -r1.165 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Jun 2003 09:30:28 -0000 1.164
+++ openpkg-src/openpkg/openpkg.spec 6 Jun 2003 12:13:26 -0000 1.165
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030604
+%define V_openpkg 20030606
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.33 -r1.34 rpmmacros
--- openpkg-src/openpkg/rpmmacros 25 Apr 2003 07:59:31 -0000 1.33
+++ openpkg-src/openpkg/rpmmacros 6 Jun 2003 12:13:26 -0000 1.34
@@ -139,24 +139,24 @@
%l_bash %{l_prefix}/lib/openpkg/bash
# provide smart paths to tools
-%l_tool_locate() %(if [ ".%{expand:%%{?use_%1}}" != . ]; then
tool="%{expand:%%{use_%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}
-%l_cc %{l_tool_locate cc}
-%l_cxx %{l_tool_locate c++}
-%l_make %{l_tool_locate make}
-%l_patch %{l_tool_locate patch}
-%l_sed %{l_tool_locate sed}
-%l_grep %{l_tool_locate grep}
-%l_awk %{l_tool_locate awk}
-%l_autoconf %{l_tool_locate autoconf}
-%l_automake %{l_tool_locate automake}
-%l_libtool %{l_tool_locate libtool}
-%l_flex %{l_tool_locate flex}
-%l_bison %{l_tool_locate bison}
-%l_perl %{l_tool_locate perl}
-%l_xmkmf %{l_tool_locate xmkmf}
+%l_tool_locate() %(if [ ".%{expand:%%{?use_%1}}" != . ]; then
tool="%{expand:%%{use_%1}}"; elif [ -f "%{l_bindir}/%2" ]; then tool="%{l_bindir}/%2";
elif [ -f "%{l_prefix}/lib/openpkg/%2" ]; then tool="%{l_prefix}/lib/openpkg/%2"; else
tool="%2"; fi; echo $tool)
+%l_gzip %{l_tool_locate gzip gzip}
+%l_bzip2 %{l_tool_locate bzip2 bzip2}
+%l_tar %{l_tool_locate tar tar}
+%l_cc %{l_tool_locate cc cc}
+%l_cxx %{l_tool_locate cxx c++}
+%l_make %{l_tool_locate make make}
+%l_patch %{l_tool_locate patch patch}
+%l_sed %{l_tool_locate sed sed}
+%l_grep %{l_tool_locate grep grep}
+%l_awk %{l_tool_locate awk awk}
+%l_autoconf %{l_tool_locate autoconf autoconf}
+%l_automake %{l_tool_locate automake automake}
+%l_libtool %{l_tool_locate libtool libtool}
+%l_flex %{l_tool_locate flex flex}
+%l_bison %{l_tool_locate bison bison}
+%l_perl %{l_tool_locate perl perl}
+%l_xmkmf %{l_tool_locate xmkmf xmkmf}
# tool options
%l_mflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -m %{-O:-O} %{l_make})
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4754 -r1.4755 news.txt
--- openpkg-web/news.txt 6 Jun 2003 10:29:26 -0000 1.4754
+++ openpkg-web/news.txt 6 Jun 2003 12:13:24 -0000 1.4755
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: P<openpkg-20030606-20030606>
06-Jun-2003: Upgraded package: P<proftpd-1.2.8-20030606>
06-Jun-2003: New package: P<ghostscript-esp-7.05.6-20030606>
06-Jun-2003: New package: P<cups-1.1.19-20030606>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
