macros: Add runstatedir option to configure

The %configure macro now uses the runstatedir option if available.
This commit is contained in:
Frederic Berat 2022-08-30 15:40:38 +02:00 committed by Florian Weimer
parent bddb41760d
commit c0d29236fe
2 changed files with 6 additions and 1 deletions

2
macros
View File

@ -12,6 +12,7 @@
# from the defaults. # from the defaults.
# #
%_localstatedir /var %_localstatedir /var
%_runstatedir /run
%_pkgdocdir %{_docdir}/%{name} %_pkgdocdir %{_docdir}/%{name}
%_docdir_fmt %%{NAME} %_docdir_fmt %%{NAME}
@ -212,6 +213,7 @@ print(result)
--libdir=%{_libdir} \\\ --libdir=%{_libdir} \\\
--libexecdir=%{_libexecdir} \\\ --libexecdir=%{_libexecdir} \\\
--localstatedir=%{_localstatedir} \\\ --localstatedir=%{_localstatedir} \\\
$(grep -q "runstatedir=DIR" %{_configure} && echo '--runstatedir=%{_runstatedir}') \\\
--sharedstatedir=%{_sharedstatedir} \\\ --sharedstatedir=%{_sharedstatedir} \\\
--mandir=%{_mandir} \\\ --mandir=%{_mandir} \\\
--infodir=%{_infodir} --infodir=%{_infodir}

View File

@ -4,7 +4,7 @@
# 2) When making changes, increment the version (in baserelease) by 1. # 2) When making changes, increment the version (in baserelease) by 1.
# rpmdev-bumpspec and other tools update the macro below, which is used # rpmdev-bumpspec and other tools update the macro below, which is used
# in Version: to get the desired effect. # in Version: to get the desired effect.
%global baserelease 229 %global baserelease 230
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
@ -221,6 +221,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md %doc buildflags.md
%changelog %changelog
* Tue Aug 30 2022 Frederic Berat <fberat@redhat.com> - 230-1
- Add support for runstatedir in %%configure
* Fri Aug 26 2022 Dan Horák <dan[at]danny.cz> - 229-1 * Fri Aug 26 2022 Dan Horák <dan[at]danny.cz> - 229-1
- Move the baseline s390x arch to z13 for F-38+ - Move the baseline s390x arch to z13 for F-38+