OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2006 19:25:24
Branch: HEAD Handle: 2006062518252400
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
- align configure call of GNU make with the "make" package
- upgrade to cURL 7.15.4 by using the GREP=grep workaround.
Summary:
Revision Changes Path
1.342 +4 -0 openpkg-src/openpkg/HISTORY
1.494 +5 -3 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.341 -r1.342 HISTORY
--- openpkg-src/openpkg/HISTORY 22 Jun 2006 08:01:37 -0000 1.341
+++ openpkg-src/openpkg/HISTORY 25 Jun 2006 17:25:24 -0000 1.342
@@ -2,6 +2,10 @@
2006
====
+20060625 align configure call of GNU make with the "make" package
+20060625 upgrade to cURL 7.15.4 by using the GREP=grep workaround.
+
+20060622 **** RELEASE AS PART OF OPENPKG 2.20060622 ***
20060622 replace release tag fiddling in openpkg.boot with "openpkg release"
functionality, too.
20060622 do not rely on RPM's smartness to not expand "%x" when we actually
meant "%%x"
20060621 use new "openpkg release" for "openpkg install" and "openpkg build"
commands
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.493 -r1.494 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Jun 2006 07:32:13 -0000 1.493
+++ openpkg-src/openpkg/openpkg.spec 25 Jun 2006 17:25:24 -0000 1.494
@@ -38,14 +38,14 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060622
+%define V_openpkg 20060625
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.3
%define V_bzip2 1.0.3
%define V_beecrypt 4.1.2
-%define V_curl 7.15.3
+%define V_curl 7.15.4
%define V_make 3.81
%define V_gzip 1.3.5
%define V_patch 2.5.9
@@ -183,7 +183,6 @@
}
prog openpkg:curl = {
version = %{V_curl}
- comment = "cs: cURL 7.15.4 requires some grep(1) not found on
Solaris core installations"
url = http://curl.haxx.se/download/
regex = curl-(__VER__)\.tar\.gz
}
@@ -634,6 +633,8 @@
( cd make-%{V_make}
CC="${l_cc}" \
./configure \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
--disable-nls \
--disable-largefile
${l_make}
@@ -807,6 +808,7 @@
CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
+ GREP="grep" \
./configure \
--cache-file=./config.cache \
--without-libidn \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
