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: 21-Feb-2005 20:01:00
Branch: OPENPKG_2_3_SOLID Handle: 20050221185818160
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/openpkg HISTORY openpkg.spec
Removed files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/openpkg zlib.patch
Log:
MFC: upgrade to ZLib 1.2.2
Summary:
Revision Changes Path
1.244.2.2 +1 -0 openpkg-src/openpkg/HISTORY
1.397.2.2 +3 -7 openpkg-src/openpkg/openpkg.spec
1.2 +0 -28 openpkg-src/openpkg/zlib.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.244.2.1 -r1.244.2.2 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Feb 2005 17:07:49 -0000
1.244.2.1
+++ openpkg-src/openpkg/HISTORY 21 Feb 2005 19:00:58 -0000
1.244.2.2
@@ -3,6 +3,7 @@
====
20050221 **** RELEASE AS PART OF OPENPKG 2.3.0 ***
+20050221 upgrade to ZLib 1.2.2 (excluded in 2.2.3)
20050209 workaround PIC/DSO related problems under FreeBSD on amd64/ia64 by
enforcing -fPIC (excluded in 2.2.3)
20050203 fix the basename(3) issues the correct way by including <libgen.h>
20050202 fix DESTDIR not being passed to subdir make
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.397.2.1 -r1.397.2.2 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Feb 2005 17:07:49 -0000
1.397.2.1
+++ openpkg-src/openpkg/openpkg.spec 21 Feb 2005 19:00:58 -0000
1.397.2.2
@@ -43,7 +43,7 @@
# the used software versions
%define V_rpm 4.2.1
-%define V_zlib 1.2.1
+%define V_zlib 1.2.2
%define V_bzip2 1.0.2
%define V_beecrypt 4.1.2
%define V_curl 7.13.0
@@ -80,7 +80,7 @@
Source8: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{V_bzip2}.tar.gz
Source9: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
Source10:
http://osdn.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
-Source11: http://www.gzip.org/zlib/zlib-%{V_zlib}.tar.gz
+Source11: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
Source12: HISTORY
Source13: README
Source14: aux.prereq.sh
@@ -131,7 +131,6 @@
Source59: uuid.8
Source60: uuid.pod
Source61: uuid.sh
-Source62: zlib.patch
# build information
Prefix: %{l_prefix}
@@ -208,7 +207,7 @@
}
prog openpkg:zlib = {
version = %{V_zlib}
- url = http://www.gzip.org/zlib/
+ url = http://www.zlib.net/
regex = zlib-(__VER__)\.tar\.gz
}
prog openpkg:uuid = {
@@ -517,9 +516,6 @@
set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distributions";
set -x
# apply OpenPKG patches to distribution trees
- ( cd zlib-%{V_zlib}
- ${l_patch} -p0 <`SOURCE zlib.patch`
- ) || exit $?
( cd rpm-%{V_rpm}
sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.bugfix` |
${l_patch} -p0
sed -e "s;@l_prefix@;%{l_prefix};g" <`SOURCE rpm.patch.feature` |
${l_patch} -p0
@@ .
rm -f openpkg-src/openpkg/zlib.patch <<'@@ .'
Index: openpkg-src/openpkg/zlib.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
