From 1dbc58e3c533168aec40229b853dc69160be4db6 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 13 Oct 2022 19:28:56 +0200 Subject: [PATCH 1/3] rpm: update to 4.18.0. --- srcpkgs/rpm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 3f2b3915daa0..05c887574e3a 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,7 +1,7 @@ # Template file for 'rpm' pkgname=rpm -version=4.17.1 -revision=3 +version=4.18.0 +revision=1 build_style=gnu-configure configure_args="--with-cap --with-acl --enable-python PYTHON=python3 --sharedstatedir=/var/lib" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://rpm.org" changelog="https://rpm.org/wiki/Releases/${version}.html" distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" -checksum=0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d +checksum=2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 python_version=3 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" From d44c1e05eee80a278069bd3197b88256ea334d5c Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Tue, 28 Mar 2023 23:58:57 +0200 Subject: [PATCH 2/3] rpm: update to 4.18.1. --- srcpkgs/rpm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 05c887574e3a..f02188d920e2 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,6 +1,6 @@ # Template file for 'rpm' pkgname=rpm -version=4.18.0 +version=4.18.1 revision=1 build_style=gnu-configure configure_args="--with-cap --with-acl @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://rpm.org" changelog="https://rpm.org/wiki/Releases/${version}.html" distfiles="https://ftp.osuosl.org/pub/rpm/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" -checksum=2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 +checksum=37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 python_version=3 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" From 4dea94f1c2b406ae04bf510f3be81b532d3be987 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 23 Mar 2023 03:05:08 +0100 Subject: [PATCH 3/3] rpm: remove dependency on musl-legacy-compat rpm doesn't depends on error.h anymore. Closes: https://github.com/void-linux/void-packages/issues/36668 --- srcpkgs/rpm/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index f02188d920e2..a2573912650f 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -22,9 +22,8 @@ CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" case "$XBPS_TARGET_MACHINE" in # rpm uses _nl_msg_cat_cntr, so it needs the glibc gettext impl - # it uses header, provided by legacy-compat *-musl) - makedepends+=" gettext-devel musl-legacy-compat" + makedepends+=" gettext-devel" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gettext" LDFLAGS="-lintl" ;;