RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 19:23:31
Branch: HEAD Handle: 2009030618233100
Modified files:
rpm CHANGES INSTALL configure.ac devtool.conf
Log:
- finally switch devtool from LZMA to XZ, too.
- remove ugly --with-lzma to --with-xz hack in configure.ac
Summary:
Revision Changes Path
1.2803 +2 -0 rpm/CHANGES
2.115 +1 -1 rpm/INSTALL
2.341 +0 -7 rpm/configure.ac
2.262 +12 -15 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2802 -r1.2803 CHANGES
--- rpm/CHANGES 6 Mar 2009 18:20:44 -0000 1.2802
+++ rpm/CHANGES 6 Mar 2009 18:23:31 -0000 1.2803
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+ - rse: finally switch devtool from LZMA to XZ, too.
+ - rse: remove ugly --with-lzma to --with-xz hack (really not needed)
- rse: cleanup a few recently introduced compile-time warnings
- jbj: rpmz: add attribution and debugging to rpmzq.
- jbj: rpmz: carve out job queue and buffer pool management from pigz.
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.114 -r2.115 INSTALL
--- rpm/INSTALL 15 Feb 2009 13:55:30 -0000 2.114
+++ rpm/INSTALL 6 Mar 2009 18:23:31 -0000 2.115
@@ -83,7 +83,7 @@
--------------- --------- ------- -------
-------------------------------------
GNU zip optional - - http://www.gzip.org/
Bzip2 optional - - http://www.bzip.org/
-LZMA Utils optional - - http://tukaani.org/lzma/
+XZ optional - - http://tukaani.org/xz/
GNU tar optional - - http://www.gnu.org/software/tar/
GNU cpio optional - - http://www.gnu.org/software/cpio/
UnZip optional - - http://www.info-zip.org/UnZip.html
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.340 -r2.341 configure.ac
--- rpm/configure.ac 21 Feb 2009 19:40:57 -0000 2.340
+++ rpm/configure.ac 6 Mar 2009 18:23:31 -0000 2.341
@@ -1099,13 +1099,6 @@
[no,external:none], [],
[], [])
-# --with-xz option was formerly known as --with-lzma
-if test ".${with_xz+set}" != .set; then
- if test "${with_lzma+set}" = set; then
- with_xz=$with_lzma
- fi
-fi
-
dnl # libLZMA
WITH_XZ_INTERNAL=false
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.261 -r2.262 devtool.conf
--- rpm/devtool.conf 16 Feb 2009 15:31:30 -0000 2.261
+++ rpm/devtool.conf 6 Mar 2009 18:23:31 -0000 2.262
@@ -72,7 +72,6 @@
--with-db-tools-integrated \
--with-zlib=external \
--with-xz=internal \
- --without-lzma \
--with-file=internal \
--with-lua=internal \
--with-sqlite=external \
@@ -196,7 +195,6 @@
--with-db-tools-integrated \
--with-pcre \
--without-xz \
- --without-lzma \
--without-openssl \
--without-nss \
--without-gcrypt \
@@ -233,7 +231,6 @@
--with-db-tools-integrated \
--with-pcre \
--without-xz \
- --without-lzma \
--without-openssl \
--without-nss \
--without-gcrypt \
@@ -359,7 +356,7 @@
# third-party library distribution versions
v_zlib="1.2.3"
v_bzip2="1.0.5"
- v_lzma="4.999.3alpha"
+ v_xz="4.999.8beta"
v_openssl="0.9.8i"
v_expat="2.0.1"
v_neon="0.28.1"
@@ -384,7 +381,7 @@
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}
lzma-${v_lzma}.tar.gz,http://rpm5.org/files/3rd/,http://tukaani.org/lzma/";
+ dist="${dist}
xz-${v_xz}.tar.gz,http://rpm5.org/files/3rd/,http://tukaani.org/xz/";
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/";
@@ -412,7 +409,7 @@
dist="${dist} libxml2-${v_libxml2}.patch,http://rpm5.org/files/3rd/";
dist="${dist} xar-${v_xar}.patch,http://rpm5.org/files/3rd/";
dist="${dist} pcre-${v_pcre}.patch,http://rpm5.org/files/3rd/";
- dist="${dist} lzma-${v_lzma}.patch,http://rpm5.org/files/3rd/";
+ dist="${dist} xz-${v_xz}.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/";
}
@@ -689,14 +686,14 @@
) || exit $?
fi
- # LZMA (uninstalled third-party library)
- if [ ! -d "$base3rd/bin/$platform/lzma-${v_lzma}" ]; then
- echo "++ building third-party library lzma-${v_lzma}"
- ( cd $base3rd/bin/$platform
- rm -rf lzma-${v_lzma}
- $gzip -d -c ../../src/lzma-${v_lzma}.tar.gz | $tar xf -
- ( cd lzma-${v_lzma}
- $patch -p0 <../../../src/lzma-${v_lzma}.patch
+ # XZ (uninstalled third-party library)
+ if [ ! -d "$base3rd/bin/$platform/xz-${v_xz}" ]; then
+ echo "++ building third-party library xz-${v_xz}"
+ ( cd $base3rd/bin/$platform
+ rm -rf xz-${v_xz}
+ $gzip -d -c ../../src/xz-${v_xz}.tar.gz | $tar xf -
+ ( cd xz-${v_xz}
+ $patch -p0 <../../../src/xz-${v_xz}.patch
CC="$cc" \
./configure \
--without-libiconv-prefix \
@@ -1103,7 +1100,7 @@
OPTION="$OPTION --with-xar=\"$base3rd/bin/$platform/xar-${v_xar}\""
OPTION="$OPTION
--with-sqlite=\"$base3rd/bin/$platform/sqlite-${v_sqlite}\""
OPTION="$OPTION
--with-db=\"$base3rd/bin/$platform/db-${v_db}/build_unix\""
- OPTION="$OPTION
--with-lzma=\"$base3rd/bin/$platform/lzma-${v_lzma}\""
+ OPTION="$OPTION --with-xz=\"$base3rd/bin/$platform/xz-${v_xz}\""
OPTION="$OPTION --without-db-rpc"
OPTION="$OPTION --without-db-largefile"
OPTION="$OPTION --with-db-tools-integrated"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
