From b9a32bc4b311b21cf133ee7f7cd3d6007f139b3e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 8 Jun 2020 12:00:05 +0300 Subject: [PATCH] Unbreak metainfo() provide generation --- ....attr-Fix-execution-of-the-generator.patch | 27 +++++++++++++++++++ rpm.spec | 8 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0001-metainfo.attr-Fix-execution-of-the-generator.patch diff --git a/0001-metainfo.attr-Fix-execution-of-the-generator.patch b/0001-metainfo.attr-Fix-execution-of-the-generator.patch new file mode 100644 index 0000000..cadf770 --- /dev/null +++ b/0001-metainfo.attr-Fix-execution-of-the-generator.patch @@ -0,0 +1,27 @@ +From 2ac60753c90ba4579b13425064e3df3d1421d61e Mon Sep 17 00:00:00 2001 +Message-Id: <2ac60753c90ba4579b13425064e3df3d1421d61e.1591606680.git.pmatilai@redhat.com> +From: Igor Raits +Date: Sun, 7 Jun 2020 14:31:19 +0200 +Subject: [PATCH] metainfo.attr: Fix execution of the generator + +Somehow it wasn't noticed before. + +Fixes: 9464926456125dacb8046767f1fe4235471986e9 +Signed-off-by: Igor Raits +--- + fileattrs/metainfo.attr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fileattrs/metainfo.attr b/fileattrs/metainfo.attr +index 1a2c3d544..d0819dabe 100644 +--- a/fileattrs/metainfo.attr ++++ b/fileattrs/metainfo.attr +@@ -1,4 +1,4 @@ +-%__metainfo_provides %{lua: ++%__metainfo_provides() %{lua: + print("metainfo()\\n") + print(string.format("metainfo(%s)\\n", rpm.expand("%{basename:%1}"))) + } +-- +2.26.2 + diff --git a/rpm.spec b/rpm.spec index ca554ef..6624c19 100644 --- a/rpm.spec +++ b/rpm.spec @@ -25,7 +25,7 @@ %global rpmver 4.16.0 %global snapver beta1 -%global rel 2 +%global rel 3 %global srcver %{rpmver}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{rpmver} | cut -d'.' -f1-2).x} @@ -40,7 +40,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.1 +Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist} Url: http://www.rpm.org/ Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2 %if %{with bdb} && %{with int_bdb} @@ -60,6 +60,7 @@ Patch6: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch # Patches already upstream: Patch100: 0001-Don-t-auto-enable-IO-flushing-on-non-rotational-disk.patch +Patch101: 0001-metainfo.attr-Fix-execution-of-the-generator.patch # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch @@ -553,6 +554,9 @@ fi %doc doc/librpm/html/* %changelog +* Mon Jun 8 2020 Panu Matilainen - 4.16.0-0.beta1.3 +- Unbreak metainfo() provide generation + * Wed Jun 3 2020 Panu Matilainen - 4.16.0-0.beta1.2 - Don't auto-enable _flush_io on non-rotational media, it's too costly