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: 24-Jan-2005 15:46:24 Branch: HEAD Handle: 2005012414462300 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrade from old config.guess/config.sub to newer versioned ones Summary: Revision Changes Path 1.238 +2 -1 openpkg-src/openpkg/HISTORY 1.390 +75 -64 openpkg-src/openpkg/openpkg.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.237 -r1.238 HISTORY --- openpkg-src/openpkg/HISTORY 23 Jan 2005 13:28:34 -0000 1.237 +++ openpkg-src/openpkg/HISTORY 24 Jan 2005 14:46:23 -0000 1.238 @@ -2,8 +2,9 @@ 2004 ==== +20050124 upgrade from old config.guess/config.sub to newer versioned ones (excluded in 2.2.3) 20050123 upgrade to OSSP uuid 1.2.0 (excluded in 2.2.3) -20050120 add support for Slackware 10.0 +20050120 add support for Slackware 10.0 (excluded in 2.2.3) 20050120 adjust copyright year in all messages to cover new year 2005 20050113 add %{l_nil} macro (excluded in 2.2.3) 20050113 upgrade to OSSP uuid 1.1.2 (excluded in 2.2.3) @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.389 -r1.390 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 23 Jan 2005 13:28:34 -0000 1.389 +++ openpkg-src/openpkg/openpkg.spec 24 Jan 2005 14:46:23 -0000 1.390 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20050123 +%define V_openpkg 20050124 # the used software versions %define V_rpm 4.2.1 @@ -53,6 +53,7 @@ %define V_tar 1.15.1 %define V_bash 3.0 %define V_uuid 1.2.0 +%define V_config 20050124 # package information Name: openpkg @@ -74,65 +75,64 @@ 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.gnu.org/gnu/bash/bash-%{V_bash}.tar.gz -Source6: ftp://ftp.gnu.org/gnu/config/config.guess -Source7: ftp://ftp.gnu.org/gnu/config/config.sub -Source8: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz -Source9: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{V_bzip2}.tar.gz -Source10: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz -Source11: http://osdn.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz -Source12: http://www.gzip.org/zlib/zlib-%{V_zlib}.tar.gz -Source13: HISTORY -Source14: README -Source15: aux.prereq.sh -Source16: aux.usrgrp.sh -Source17: aux.wrapbin.sh -Source18: aux.wrapsrc.sh -Source19: bash.patch -Source20: beecrypt.patch -Source21: dot.bash_login -Source22: dot.bashrc -Source23: dot.lsyncrc -Source24: local.README -Source25: lsync -Source26: lsync.8 -Source27: lsync.pod -Source28: make.patch -Source29: install.sh -Source30: man.sh -Source31: openpkg.1 -Source32: openpkg.boot -Source33: openpkg.pgp -Source34: openpkg.pod -Source35: openpkg.sh -Source36: pod2man.sh -Source37: rc -Source38: rc.8 -Source39: rc.conf -Source40: rc.func -Source41: rc.openpkg -Source42: rc.pod -Source43: root.README -Source44: rpm-config.8 -Source45: rpm-config.pod -Source46: rpm-config.sh -Source47: rpm.patch.bugfix -Source48: rpm.patch.feature -Source49: rpm.patch.porting -Source50: rpm.patch.regen -Source51: rpmdb -Source52: rpmmacros -Source53: rpmpopt -Source54: rpmrc -Source55: rpmtool -Source56: rpmtool.8 -Source57: rpmtool.pod -Source58: shtool -Source59: tar.patch -Source60: uuid.8 -Source61: uuid.pod -Source62: uuid.sh -Source63: zlib.patch -Source64: curl.patch +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: 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 +Source12: HISTORY +Source13: README +Source14: aux.prereq.sh +Source15: aux.usrgrp.sh +Source16: aux.wrapbin.sh +Source17: aux.wrapsrc.sh +Source18: bash.patch +Source19: beecrypt.patch +Source20: dot.bash_login +Source21: dot.bashrc +Source22: dot.lsyncrc +Source23: local.README +Source24: lsync +Source25: lsync.8 +Source26: lsync.pod +Source27: make.patch +Source28: install.sh +Source29: man.sh +Source30: openpkg.1 +Source31: openpkg.boot +Source32: openpkg.pgp +Source33: openpkg.pod +Source34: openpkg.sh +Source35: pod2man.sh +Source36: rc +Source37: rc.8 +Source38: rc.conf +Source39: rc.func +Source40: rc.openpkg +Source41: rc.pod +Source42: root.README +Source43: rpm-config.8 +Source44: rpm-config.pod +Source45: rpm-config.sh +Source46: rpm.patch.bugfix +Source47: rpm.patch.feature +Source48: rpm.patch.porting +Source49: rpm.patch.regen +Source50: rpmdb +Source51: rpmmacros +Source52: rpmpopt +Source53: rpmrc +Source54: rpmtool +Source55: rpmtool.8 +Source56: rpmtool.pod +Source57: shtool +Source58: tar.patch +Source59: uuid.8 +Source60: uuid.pod +Source61: uuid.sh +Source62: zlib.patch +Source63: curl.patch # build information Prefix: %{l_prefix} @@ -216,6 +216,11 @@ url = ftp://ftp.ossp.org/pkg/lib/uuid/ regex = uuid-(__VER__)\.tar\.gz } + prog openpkg:config = { + version = %{V_config} + url = ftp://ftp.openpkg.org/sources/CPY/config/ + regex = config-(__VER__)\.tar\.gz + } %prep # skip in bootstrap phase 2 (see openpkg.boot) @@ -431,14 +436,20 @@ echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv # display verbosity header + set +x; VERBOSE "PREPARATION: Unpack GNU configuration guessing utilities"; set -x + + # unpack GNU config.guess + ${l_gzip} -dc `SOURCE config-%{V_config}.tar.gz` | ${l_tar} xf - 2>/dev/null || true + + # display verbosity header set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"; set -x # bootstrap GNU patch tool ${l_gzip} -dc `SOURCE patch-%{V_patch}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ( cd patch-%{V_patch} chmod u+w config.guess config.sub >/dev/null 2>&1 || true - cp `SOURCE config.guess` . - cp `SOURCE config.sub` . + cp ../config/config.guess . + cp ../config/config.sub . ( echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' echo 'ac_cv_prog_cc_g=no' false=`sh $shtool path false` @@ -498,8 +509,8 @@ for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt beecrypt-%{V_beecrypt} \ curl-%{V_curl} make-%{V_make} bash-%{V_bash}/support; do chmod u+w $dir/config.guess $dir/config.sub >/dev/null 2>&1 || true - cp `SOURCE config.guess` $dir/ - cp `SOURCE config.sub` $dir/ + cp config/config.guess $dir/ + cp config/config.sub $dir/ done # display verbosity header @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org