Unbreak metainfo() provide generation

This commit is contained in:
Panu Matilainen 2020-06-08 12:00:05 +03:00
parent 220819b9e7
commit b9a32bc4b3
2 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,27 @@
From 2ac60753c90ba4579b13425064e3df3d1421d61e Mon Sep 17 00:00:00 2001
Message-Id: <2ac60753c90ba4579b13425064e3df3d1421d61e.1591606680.git.pmatilai@redhat.com>
From: Igor Raits <i.gnatenko.brain@gmail.com>
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 <i.gnatenko.brain@gmail.com>
---
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

View File

@ -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 <pmatilai@redhat.com> - 4.16.0-0.beta1.3
- Unbreak metainfo() provide generation
* Wed Jun 3 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-0.beta1.2
- Don't auto-enable _flush_io on non-rotational media, it's too costly