From 6659ae6738a8fcca27290ca97eb1d1e9b954470f Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Jun 28 2019 14:02:51 +0000 Subject: vars/build.vars:rpm{,_host}:${PKG_URL}: fixed. --- diff --git a/vars/build.vars b/vars/build.vars index dc3729f..2b00254 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -88,7 +88,7 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}"; : ${PKG_POPT_HOST_URL:=http://rpm5.org/files/popt/popt-${PKG_POPT_HOST_VERSION}.tar.gz}; : ${PKG_RPM_HOST_SHA256SUM:=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda}; : ${PKG_RPM_HOST_VERSION:=4.14.2.1}; -: ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2}; +: ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2}; : ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"}; : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="-without-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"}; : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; @@ -726,7 +726,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_ZSTD_SUBDIR:=zstd-${PKG_ZSTD_VERSION}}; : ${PKG_RPM_SHA256SUM:=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda}; : ${PKG_RPM_VERSION:=4.14.2.1}; -: ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; +: ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; : ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"}; : ${PKG_LIBSOLV_SHA256SUM:=153eb48814ffdbac396c98126037cf45c07e2b7087a61f86eb18a75ea1ab134b}; : ${PKG_LIBSOLV_VERSION:=0.6.34};