From c0d29236fe73fd2e51bb64a4566d1aea5ae4d91c Mon Sep 17 00:00:00 2001 From: Frederic Berat Date: Tue, 30 Aug 2022 15:40:38 +0200 Subject: [PATCH] macros: Add runstatedir option to configure The %configure macro now uses the runstatedir option if available. --- macros | 2 ++ redhat-rpm-config.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/macros b/macros index 734863f..4a554b9 100644 --- a/macros +++ b/macros @@ -12,6 +12,7 @@ # from the defaults. # %_localstatedir /var +%_runstatedir /run %_pkgdocdir %{_docdir}/%{name} %_docdir_fmt %%{NAME} @@ -212,6 +213,7 @@ print(result) --libdir=%{_libdir} \\\ --libexecdir=%{_libexecdir} \\\ --localstatedir=%{_localstatedir} \\\ + $(grep -q "runstatedir=DIR" %{_configure} && echo '--runstatedir=%{_runstatedir}') \\\ --sharedstatedir=%{_sharedstatedir} \\\ --mandir=%{_mandir} \\\ --infodir=%{_infodir} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 313dea7..08ce294 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 229 +%global baserelease 230 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -221,6 +221,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Tue Aug 30 2022 Frederic Berat - 230-1 +- Add support for runstatedir in %%configure + * Fri Aug 26 2022 Dan HorĂ¡k - 229-1 - Move the baseline s390x arch to z13 for F-38+