From e97d188a46ca280a6d7c3cd0bcfb2307885121b0 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 8 Jul 2024 15:03:34 -0400 Subject: [PATCH] Set an appropriate value for %{distcore} for RHEL 10 %{distcore} is not currently used in the configuration of kojihub.stream.centos.org or Brew, but it's supported in centos-stream-release and redhat-release, so make sure that we have the right value here to future-proof. Related: RHEL-24326 --- flatpak-rpm-macros.spec | 5 ++++- macros.flatpak.in | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flatpak-rpm-macros.spec b/flatpak-rpm-macros.spec index c6a92bf..8d5b300 100644 --- a/flatpak-rpm-macros.spec +++ b/flatpak-rpm-macros.spec @@ -1,6 +1,6 @@ Name: flatpak-rpm-macros Version: 40 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Macros for building RPMS for flatpaks Source0: macros.flatpak.in Source1: distutils.cfg @@ -45,6 +45,9 @@ install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3} %{_rpmconfigdir}/fontconfig-flatpak.prov %changelog +* Mon Jul 8 2024 Owen Talyor - 40-5 +rhel10: set an appropriate value for %%{distcore} + * Mon Jun 24 2024 Troy Dawson - 40-4 - Bump release for June 2024 mass rebuild diff --git a/macros.flatpak.in b/macros.flatpak.in index 140beb6..abd1f82 100644 --- a/macros.flatpak.in +++ b/macros.flatpak.in @@ -1,7 +1,5 @@ %flatpak 1 -%distcore .fc%{fedora}app -# This definition of dist in terms of distcore is standard in fedora-release from F40 on, but duplicated here for F39 -%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}%{distcore}%{?with_bootstrap:%{__bootstrap}} +%distcore .el10flatpak-app %_prefix /app %_sysconfdir %{_prefix}/etc %_localstatedir %{_prefix}/var