rpms/flatpak-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Set an appropriate value for %{distcore} for RHEL 10

Browse Source 
%{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
This commit is contained in:
Owen W. Taylor 2024-07-08 15:03:34 -04:00
parent ca4baf7c38
commit e97d188a46
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flatpak-rpm-macros.spec
View File

@ -1,6 +1,6 @@
Name: flatpak-rpm-macros Name: flatpak-rpm-macros
Version: 40 Version: 40
Release: 4%{?dist} Release: 5%{?dist}
Summary: Macros for building RPMS for flatpaks Summary: Macros for building RPMS for flatpaks
Source0: macros.flatpak.in Source0: macros.flatpak.in
Source1: distutils.cfg Source1: distutils.cfg
@ -45,6 +45,9 @@ install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3}
%{_rpmconfigdir}/fontconfig-flatpak.prov %{_rpmconfigdir}/fontconfig-flatpak.prov
%changelog %changelog
* Mon Jul 8 2024 Owen Talyor <otaylor@redhat.com> - 40-5
rhel10: set an appropriate value for %%{distcore}
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 40-4 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 40-4
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild

4
macros.flatpak.in
View File

@ -1,7 +1,5 @@
%flatpak 1 %flatpak 1
%distcore .fc%{fedora}app %distcore .el10flatpak-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}}
%_prefix /app %_prefix /app
%_sysconfdir %{_prefix}/etc %_sysconfdir %{_prefix}/etc
%_localstatedir %{_prefix}/var %_localstatedir %{_prefix}/var