RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jason Corley
Root: /v/rpm/cvs Email: jasonc@rpm5.org
Module: rpm Date: 29-Aug-2007 18:41:59
Branch: HEAD Handle: 2007082917415800
Modified files:
rpm devtool devtool.conf
Log:
Move third party version and location information out of the standalone target
and into its own target so that other targets can reuse that information
without duplication. target target
Summary:
Revision Changes Path
2.6 +1 -0 rpm/devtool
2.90 +55 -52 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool
============================================================================
$ cvs diff -u -r2.5 -r2.6 devtool
--- rpm/devtool 16 Jul 2007 14:47:03 -0000 2.5
+++ rpm/devtool 29 Aug 2007 16:41:58 -0000 2.6
@@ -42,6 +42,7 @@
touch $tmpfile
( sed <${DEVTOOL_SRCDIR}/devtool -e '1,/^## devtool.func {/d' -e '/^## } devtool.func/,$d'
sed <${DEVTOOL_SRCDIR}/devtool.conf -e "1,/^%common/d" -e '/^%.*/,$d'
+ sed <${DEVTOOL_SRCDIR}/devtool.conf -e "1,/^%thirdpartydefs/d" -e '/^%.*/,$d'
sed <${DEVTOOL_SRCDIR}/devtool.conf -e "1,/^%$cmd/d" -e '/^%.*/,$d' ) |\
sed -e 's;\([ ]\)@\([a-zA-Z_][a-zA-Z0-9_-]*\);\1devtool_\2;' \
-e 's;\([ ]\)%\([a-zA-Z_][a-zA-Z0-9_-]*\);\1devtool_devtool \2;' \
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.89 -r2.90 devtool.conf
--- rpm/devtool.conf 25 Aug 2007 08:03:15 -0000 2.89
+++ rpm/devtool.conf 29 Aug 2007 16:41:58 -0000 2.90
@@ -130,6 +130,60 @@
%rse
%standalone
+%thirdpartydefs
+ # third-party development tools distribution versions
+ v_m4="1.4.9"
+ v_autoconf="2.61"
+ v_automake="1.10"
+ v_libtool="1.5.24"
+ v_gettext="0.16.1"
+
+ # third-party library distribution versions
+ v_zlib="1.2.3"
+ v_bzip2="1.0.4"
+ v_openssl="0.9.8e"
+ v_expat="2.0.1"
+ v_neon="0.27.0"
+ v_beecrypt="4.1.2"
+ v_db="4.6.19"
+ v_sqlite="3.4.2"
+ v_lua="5.1.2"
+ v_file="4.21"
+ v_popt="1.12"
+ v_config="20070825"
+
+ # third-party distribution files
+ dist=""
+ dist="${dist} m4-${v_m4}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/m4/"
+ dist="${dist} autoconf-${v_autoconf}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/autoconf/"
+ dist="${dist} automake-${v_automake}.tar.gz,http://rpm5.org/files/3rd/,ftp://sources.redhat.com/pub/automake/"
+ dist="${dist} libtool-${v_libtool}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/libtool/"
+ dist="${dist} gettext-${v_gettext}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/gettext/"
+ dist="${dist} zlib-${v_zlib}.tar.gz,http://rpm5.org/files/3rd/,http://www.zlib.net/"
+ dist="${dist} bzip2-${v_bzip2}.tar.gz,http://rpm5.org/files/3rd/,http://www.bzip.org/${v_bzip2}/"
+ dist="${dist} openssl-${v_openssl}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.openssl.org/source/"
+ dist="${dist} expat-${v_expat}.tar.gz,http://rpm5.org/files/3rd/,http://switch.dl.sourceforge.net/expat/"
+ dist="${dist} neon-${v_neon}.tar.gz,http://rpm5.org/files/3rd/,http://www.webdav.org/neon/"
+ dist="${dist} beecrypt-${v_beecrypt}.tar.gz,http://rpm5.org/files/3rd/,http://switch.dl.sourceforge.net/beecrypt/"
+ dist="${dist} db-${v_db}.tar.gz,http://rpm5.org/files/3rd/,http://download-uk.oracle.com/berkeley-db/"
+ dist="${dist} sqlite-${v_sqlite}.tar.gz,http://rpm5.org/files/3rd/,http://www.sqlite.org/"
+ dist="${dist} lua-${v_lua}.tar.gz,http://rpm5.org/files/3rd/,http://www.lua.org/ftp/"
+ dist="${dist} file-${v_file}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.astron.com/pub/file/"
+ dist="${dist} popt-${v_popt}.tar.gz,http://rpm5.org/files/3rd/,http://rpm5.org/files/popt/"
+
+ # third-party distribution patches (for portability and bugfix reasons only)
+ dist="${dist} automake-${v_automake}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} gettext-${v_gettext}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} openssl-${v_openssl}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} beecrypt-${v_beecrypt}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} db-${v_db}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} sqlite-${v_sqlite}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} lua-${v_lua}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} file-${v_file}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} popt-${v_popt}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} config.guess-${v_config},http://rpm5.org/files/3rd/"
+ dist="${dist} config.sub-${v_config},http://rpm5.org/files/3rd/"
+
%standalone
##
## USE THIS DEVELOPER PROCEDURE IF YOU WANT TO REALLY
@@ -183,58 +237,7 @@
## o 2007-07-25: ppc-aix5.3-gcc3.3.2
##
- # third-party development tools distribution versions
- v_m4="1.4.9"
- v_autoconf="2.61"
- v_automake="1.10"
- v_libtool="1.5.24"
- v_gettext="0.16.1"
-
- # third-party library distribution versions
- v_zlib="1.2.3"
- v_bzip2="1.0.4"
- v_openssl="0.9.8e"
- v_expat="2.0.1"
- v_neon="0.27.0"
- v_beecrypt="4.1.2"
- v_db="4.6.19"
- v_sqlite="3.4.2"
- v_lua="5.1.2"
- v_file="4.21"
- v_popt="1.12"
- v_config="20070825"
-
- # third-party distribution files
- dist=""
- dist="${dist} m4-${v_m4}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/m4/"
- dist="${dist} autoconf-${v_autoconf}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/autoconf/"
- dist="${dist} automake-${v_automake}.tar.gz,http://rpm5.org/files/3rd/,ftp://sources.redhat.com/pub/automake/"
- dist="${dist} libtool-${v_libtool}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/libtool/"
- dist="${dist} gettext-${v_gettext}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/gettext/"
- dist="${dist} zlib-${v_zlib}.tar.gz,http://rpm5.org/files/3rd/,http://www.zlib.net/"
- dist="${dist} bzip2-${v_bzip2}.tar.gz,http://rpm5.org/files/3rd/,http://www.bzip.org/${v_bzip2}/"
- dist="${dist} openssl-${v_openssl}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.openssl.org/source/"
- dist="${dist} expat-${v_expat}.tar.gz,http://rpm5.org/files/3rd/,http://switch.dl.sourceforge.net/expat/"
- dist="${dist} neon-${v_neon}.tar.gz,http://rpm5.org/files/3rd/,http://www.webdav.org/neon/"
- dist="${dist} beecrypt-${v_beecrypt}.tar.gz,http://rpm5.org/files/3rd/,http://switch.dl.sourceforge.net/beecrypt/"
- dist="${dist} db-${v_db}.tar.gz,http://rpm5.org/files/3rd/,http://download-uk.oracle.com/berkeley-db/"
- dist="${dist} sqlite-${v_sqlite}.tar.gz,http://rpm5.org/files/3rd/,http://www.sqlite.org/"
- dist="${dist} lua-${v_lua}.tar.gz,http://rpm5.org/files/3rd/,http://www.lua.org/ftp/"
- dist="${dist} file-${v_file}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.astron.com/pub/file/"
- dist="${dist} popt-${v_popt}.tar.gz,http://rpm5.org/files/3rd/,http://rpm5.org/files/popt/"
-
- # third-party distribution patches (for portability and bugfix reasons only)
- dist="${dist} automake-${v_automake}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} gettext-${v_gettext}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} openssl-${v_openssl}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} beecrypt-${v_beecrypt}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} db-${v_db}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} sqlite-${v_sqlite}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} lua-${v_lua}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} file-${v_file}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} popt-${v_popt}.patch,http://rpm5.org/files/3rd/"
- dist="${dist} config.guess-${v_config},http://rpm5.org/files/3rd/"
- dist="${dist} config.sub-${v_config},http://rpm5.org/files/3rd/"
+ %thirdpartydefs
# prerequisite check
for tool in gzip tar patch perl; do
@@ .
Received on Wed Aug 29 18:41:59 2007