From d7d3c997acf8c19cab1456a4b0a63d91da68aac6 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Wed, 15 Oct 2025 13:05:42 +0200
Subject: [PATCH] Correct things after mistakenly using RHEL 9 SRPM for import

Re-enable the python2 support and fix various things that broke when I've
by mistake used RHEL 9 SRPM when importing into RHEL 8

Resolves: RHEL-121407
---
 com.redhat.Platform.appdata.xml |  2 +-
 com.redhat.Sdk.appdata.xml      |  2 +-
 flatpak-runtime-config.spec     | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/com.redhat.Platform.appdata.xml b/com.redhat.Platform.appdata.xml
index 480d06f..ea09ef2 100644
--- a/com.redhat.Platform.appdata.xml
+++ b/com.redhat.Platform.appdata.xml
@@ -6,7 +6,7 @@
   <name>Red Hat Platform</name>
   <summary>Shared libraries</summary>
   <releases>
-    <release version="9" date="2021-06-29"/>
+    <release version="8" date="2020-04-28"/>
   </releases>
   <description>
     <p>
diff --git a/com.redhat.Sdk.appdata.xml b/com.redhat.Sdk.appdata.xml
index f184262..5e9a2b5 100644
--- a/com.redhat.Sdk.appdata.xml
+++ b/com.redhat.Sdk.appdata.xml
@@ -6,7 +6,7 @@
   <name>Red Hat SDK</name>
   <summary>Tools and headers for developing applications</summary>
   <releases>
-    <release version="9" date="2021-06-29"/>
+    <release version="8" date="2020-04-28"/>
   </releases>
   <description>
     <p>
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index f0a2d7e..c7d13df 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,6 +1,6 @@
 Name:           flatpak-runtime-config
 Version:        34
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 Source2:        usercustomize.py
@@ -11,6 +11,8 @@ Source6:        05-flatpak-fontpath.conf
 
 License:        MIT
 
+BuildRequires:  python2
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python3
 BuildRequires:  python3-rpm-macros
 
@@ -27,6 +29,8 @@ files that need to be different when executing a flatpak.
 %build
 
 %install
+export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
+
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
@@ -34,7 +38,7 @@ install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}
 install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE6}
 
 # usercustomize.py to set up Python paths
-for d in %{python3_sitelib} ; do
+for d in %{python2_sitelib} %{python3_sitelib} ; do
     mkdir -p $RPM_BUILD_ROOT/$d
     install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2}
 done
@@ -81,6 +85,7 @@ HOME=/root /usr/bin/fc-cache -s
 %files
 %dir %{_prefix}/cache
 %dir %{_prefix}/cache/fontconfig
+%{python2_sitelib}
 %{python3_sitelib}
 %{_datadir}/metainfo/*.appdata.xml
 %{_sysconfdir}/flatpak-builder/
@@ -88,6 +93,11 @@ HOME=/root /usr/bin/fc-cache -s
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Wed Oct 15 2025 Tomas Popela <tpopela@redhat.com> - 34-4
+- Re-enable the python2 support and fix various things that broke when I've
+  by mistake used RHEL 9 SRPM when importing into RHEL 8
+- Resolves: RHEL-121407
+
 * Fri Mar 24 2023 Tomas Popela <tpopela@redhat.com> - 34-3
 - Sync with Fedora
 - Add a seed for <dir prefix="xdg">fonts</dir> (by tagoh)