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: 06-Dec-2006 12:19:25
Branch: HEAD Handle: 2006120611192500
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
switch GNU gzip from pre-patched OpenPKG tarball to pristine upstream
tarball plus OpenPKG "update" tarball
Summary:
Revision Changes Path
1.405 +1 -0 openpkg-src/openpkg/HISTORY
1.551 +82 -73 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.404 -r1.405 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Dec 2006 09:11:24 -0000 1.404
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 11:19:25 -0000 1.405
@@ -2,6 +2,7 @@
2006
====
+20061206 switch GNU gzip from pre-patched OpenPKG tarball to pristine
upstream tarball plus OpenPKG "update" tarball
20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
20061129 upgrade to GNU gzip 1.3.6
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.550 -r1.551 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 6 Dec 2006 09:11:24 -0000 1.550
+++ openpkg-src/openpkg/openpkg.spec 6 Dec 2006 11:19:25 -0000 1.551
@@ -49,6 +49,7 @@
%define V_curl 7.16.0
%define V_make 3.81
%define V_gzip 1.3.6
+%define V_gzip_r 1.7
%define V_patch 2.5.9
%define V_tar 1.16
%define V_bash 3.2
@@ -75,78 +76,79 @@
# list of sources
Source0: ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz
Source1: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{V_uuid}.tar.gz
-Source2:
ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg.tar
-Source3: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
-Source4: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
-Source5: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
-Source6:
ftp://ftp.openpkg.org/sources/CPY/config/config-%{V_config}.tar.gz
-Source7: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
-Source8: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
-Source9: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
-Source10:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
-Source11: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Source12:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
-Source13:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
-Source14:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
-Source15: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
-Source16: HISTORY
-Source17: README
-Source18: aux.prereq.sh
-Source19: aux.usrgrp.sh
-Source20: aux.wrapbin.sh
-Source21: aux.wrapsrc.sh
-Source22: bash.patch
-Source23: beecrypt.patch
-Source24: dot.bash_login
-Source25: dot.bashrc
-Source26: dot.lsyncrc
-Source27: install.sh
-Source28: local.README
-Source29: lsync
-Source30: lsync.8
-Source31: lsync.pod
-Source32: make.patch
-Source33: man.sh
-Source34: openpkg.1
-Source35: openpkg.boot
-Source36: openpkg.c
-Source37: openpkg.com.pgp
-Source38: openpkg.net.pgp
-Source39: openpkg.org.pgp
-Source40: openpkg.pod
-Source41: openpkg.sh
-Source42: openssl.patch
-Source43: perl.patch
-Source44: pod2man.sh
-Source45: rc
-Source46: rc.8
-Source47: rc.conf
-Source48: rc.func
-Source49: rc.openpkg
-Source50: rc.pod
-Source51: release.8
-Source52: release.pod
-Source53: release.sh
-Source54: root.README
-Source55: rpm-config.8
-Source56: rpm-config.pod
-Source57: rpm-config.sh
-Source58: rpm.patch.bugfix
-Source59: rpm.patch.feature
-Source60: rpm.patch.porting
-Source61: rpm.patch.regen
-Source62: rpmdb
-Source63: rpmmacros
-Source64: rpmpopt
-Source65: rpmrc
-Source66: rpmtool
-Source67: rpmtool.8
-Source68: rpmtool.pod
-Source69: shtool
-Source70: tar.patch
-Source71: uuid.8
-Source72: uuid.pod
-Source73: uuid.sh
+Source2: ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}.tar
+Source3:
ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar
+Source4: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
+Source5: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
+Source6: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
+Source7:
ftp://ftp.openpkg.org/sources/CPY/config/config-%{V_config}.tar.gz
+Source8: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
+Source9: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
+Source10: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
+Source11:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
+Source12: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
+Source13:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
+Source14:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
+Source15:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
+Source16: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
+Source17: HISTORY
+Source18: README
+Source19: aux.prereq.sh
+Source20: aux.usrgrp.sh
+Source21: aux.wrapbin.sh
+Source22: aux.wrapsrc.sh
+Source23: bash.patch
+Source24: beecrypt.patch
+Source25: dot.bash_login
+Source26: dot.bashrc
+Source27: dot.lsyncrc
+Source28: install.sh
+Source29: local.README
+Source30: lsync
+Source31: lsync.8
+Source32: lsync.pod
+Source33: make.patch
+Source34: man.sh
+Source35: openpkg.1
+Source36: openpkg.boot
+Source37: openpkg.c
+Source38: openpkg.com.pgp
+Source39: openpkg.net.pgp
+Source40: openpkg.org.pgp
+Source41: openpkg.pod
+Source42: openpkg.sh
+Source43: openssl.patch
+Source44: perl.patch
+Source45: pod2man.sh
+Source46: rc
+Source47: rc.8
+Source48: rc.conf
+Source49: rc.func
+Source50: rc.openpkg
+Source51: rc.pod
+Source52: release.8
+Source53: release.pod
+Source54: release.sh
+Source55: root.README
+Source56: rpm-config.8
+Source57: rpm-config.pod
+Source58: rpm-config.sh
+Source59: rpm.patch.bugfix
+Source60: rpm.patch.feature
+Source61: rpm.patch.porting
+Source62: rpm.patch.regen
+Source63: rpmdb
+Source64: rpmmacros
+Source65: rpmpopt
+Source66: rpmrc
+Source67: rpmtool
+Source68: rpmtool.8
+Source69: rpmtool.pod
+Source70: shtool
+Source71: tar.patch
+Source72: uuid.8
+Source73: uuid.pod
+Source74: uuid.sh
# build information
Prefix: %{l_prefix}
@@ -191,10 +193,16 @@
regex = curl-(__VER__)\.tar\.gz
}
prog openpkg:gzip = {
+ comment = "rse: intentionally tracked at gnu.org, although fetched
from openpkg.org because of uncompression"
version = %{V_gzip}
url = ftp://alpha.gnu.org/gnu/gzip/
regex = gzip-(__VER__)\.tar(\.gz)?
}
+ prog openpkg:gzip_r = {
+ version = %{V_gzip_r}
+ url = ftp://ftp.openpkg.org/sources/CPY/openpkg/
+ regex = gzip-%{V_gzip}-openpkg-r(__VER__)\.tar
+ }
prog openpkg:make = {
version = %{V_make}
url = ftp://ftp.gnu.org/gnu/make/
@@ -493,7 +501,8 @@
set +x; VERBOSE "PREPARATION: Build GNU gzip (Compression Tool)"; set -x
# bootstrap GNU zip tool
- ${l_tar} xf `SOURCE gzip-%{V_gzip}-openpkg.tar` 2>/dev/null || true
+ ${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
+ ${l_tar} xf `SOURCE gzip-%{V_gzip}-openpkg-r%{V_gzip_r}.tar` 2>/dev/null
|| true
( cd gzip-%{V_gzip}
echo "ac_cv_prog_cc_g=no" >config.cache
case $plid in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
