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: 02-Oct-2004 18:18:21
Branch: HEAD Handle: 2004100217182001
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
cleanup more shtool usages
Summary:
Revision Changes Path
1.214 +1 -0 openpkg-src/openpkg/HISTORY
1.361 +3 -3 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.213 -r1.214 HISTORY
--- openpkg-src/openpkg/HISTORY 28 Sep 2004 21:51:52 -0000 1.213
+++ openpkg-src/openpkg/HISTORY 2 Oct 2004 16:18:20 -0000 1.214
@@ -2,6 +2,7 @@
2004
====
+20041002 cleanup more shtool usages
20040928 fix broken shtool usage introduced in 20040924
20040924 remove the beecrypt C++ preprocessor configure test
20040923 fix building of cURL under at least FreeBSD 5.3.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.360 -r1.361 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 28 Sep 2004 21:51:52 -0000 1.360
+++ openpkg-src/openpkg/openpkg.spec 2 Oct 2004 16:18:21 -0000 1.361
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040928
+%define V_openpkg 20041002
# the used software versions
%define V_rpm 4.2.1
@@ -638,7 +638,7 @@
# build cURL tool
( cd curl-%{V_curl}
- %{l_prefix}/lib/openpkg/shtool subst \
+ sh $shtool subst \
-e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
( echo 'ac_cv_header_openssl_engine_h=no'
@@ -1063,7 +1063,7 @@
mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg
# install platform identification file
- sh `SOURCE shtool` platform -n -L -S "" -C "+" -F "%<ap>-any-%<sp>" \
+ sh $shtool platform -n -L -S "" -C "+" -F "%<ap>-any-%<sp>" \
>$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/platform
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/platform
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
