From f81c71fa9a6fa6e3bac19eaba66a24658ef4af2e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 5 Nov 2025 07:47:16 +0000 Subject: [PATCH] Import from CS git --- .../05-flatpak-fontpath.conf | 0 50-flatpak.conf => SOURCES/50-flatpak.conf | 2 - .../com.redhat.Platform.appdata.xml | 4 +- .../com.redhat.Sdk.appdata.xml | 2 +- defaults.json.in => SOURCES/defaults.json.in | 0 sitecustomize.py => SOURCES/usercustomize.py | 0 .../flatpak-runtime-config.spec | 122 +++++------------- gating.yaml | 6 - org.centos.stream.Platform.appdata.xml | 19 --- org.centos.stream.Sdk.appdata.xml | 19 --- sources | 0 11 files changed, 32 insertions(+), 142 deletions(-) rename 05-flatpak-fontpath.conf => SOURCES/05-flatpak-fontpath.conf (100%) rename 50-flatpak.conf => SOURCES/50-flatpak.conf (91%) rename com.redhat.Platform.appdata.xml => SOURCES/com.redhat.Platform.appdata.xml (86%) rename com.redhat.Sdk.appdata.xml => SOURCES/com.redhat.Sdk.appdata.xml (94%) rename defaults.json.in => SOURCES/defaults.json.in (100%) rename sitecustomize.py => SOURCES/usercustomize.py (100%) rename flatpak-runtime-config.spec => SPECS/flatpak-runtime-config.spec (64%) delete mode 100644 gating.yaml delete mode 100644 org.centos.stream.Platform.appdata.xml delete mode 100644 org.centos.stream.Sdk.appdata.xml delete mode 100644 sources diff --git a/05-flatpak-fontpath.conf b/SOURCES/05-flatpak-fontpath.conf similarity index 100% rename from 05-flatpak-fontpath.conf rename to SOURCES/05-flatpak-fontpath.conf diff --git a/50-flatpak.conf b/SOURCES/50-flatpak.conf similarity index 91% rename from 50-flatpak.conf rename to SOURCES/50-flatpak.conf index 336183c..27e0964 100644 --- a/50-flatpak.conf +++ b/SOURCES/50-flatpak.conf @@ -7,8 +7,6 @@ /usr/cache/fontconfig /app/share/fonts - /app/share/X11/fonts/Type1 - /app/share/X11/fonts/TTF /app/cache/fontconfig /app/etc/fonts/local.conf diff --git a/com.redhat.Platform.appdata.xml b/SOURCES/com.redhat.Platform.appdata.xml similarity index 86% rename from com.redhat.Platform.appdata.xml rename to SOURCES/com.redhat.Platform.appdata.xml index bd19598..ea09ef2 100644 --- a/com.redhat.Platform.appdata.xml +++ b/SOURCES/com.redhat.Platform.appdata.xml @@ -1,12 +1,12 @@ com.redhat.Platform - CC0-1.0 + CC0 https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel Red Hat Platform Shared libraries - +

diff --git a/com.redhat.Sdk.appdata.xml b/SOURCES/com.redhat.Sdk.appdata.xml similarity index 94% rename from com.redhat.Sdk.appdata.xml rename to SOURCES/com.redhat.Sdk.appdata.xml index 545ab6e..5e9a2b5 100644 --- a/com.redhat.Sdk.appdata.xml +++ b/SOURCES/com.redhat.Sdk.appdata.xml @@ -6,7 +6,7 @@ Red Hat SDK

Tools and headers for developing applications - +

diff --git a/defaults.json.in b/SOURCES/defaults.json.in similarity index 100% rename from defaults.json.in rename to SOURCES/defaults.json.in diff --git a/sitecustomize.py b/SOURCES/usercustomize.py similarity index 100% rename from sitecustomize.py rename to SOURCES/usercustomize.py diff --git a/flatpak-runtime-config.spec b/SPECS/flatpak-runtime-config.spec similarity index 64% rename from flatpak-runtime-config.spec rename to SPECS/flatpak-runtime-config.spec index a59dd93..c7d13df 100644 --- a/flatpak-runtime-config.spec +++ b/SPECS/flatpak-runtime-config.spec @@ -1,26 +1,21 @@ -# package notes require setting RPM-specific environment variables, -# incompatible with flatpak-builder -%undefine _package_note_flags - Name: flatpak-runtime-config -Version: 40 -Release: 5%{?dist} +Version: 34 +Release: 4%{?dist} Summary: Configuration files that live inside the flatpak runtime Source1: 50-flatpak.conf -Source2: sitecustomize.py -Source3: defaults.json.in -Source4: com.redhat.Platform.appdata.xml -Source5: com.redhat.Sdk.appdata.xml -Source6: org.centos.stream.Platform.appdata.xml -Source7: org.centos.stream.Sdk.appdata.xml -Source10: 05-flatpak-fontpath.conf +Source2: usercustomize.py +Source3: com.redhat.Platform.appdata.xml +Source4: com.redhat.Sdk.appdata.xml +Source5: defaults.json.in +Source6: 05-flatpak-fontpath.conf License: MIT +BuildRequires: python2 +BuildRequires: python2-rpm-macros BuildRequires: python3 BuildRequires: python3-rpm-macros -Requires: findutils Requires: fontpackages-filesystem %description @@ -34,28 +29,24 @@ 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 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 %{SOURCE10} +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 # Install appdata for both the Platform and the Sdk mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo -%if 0%{?rhel} +install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE3} install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE5} -%endif -%if 0%{?centos} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE6} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE7} -%endif # Install flatpak-builder config file mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder @@ -64,7 +55,7 @@ sed -e 's|%%{_libdir}|%{_libdir}|' \ -e 's|%%{build_cflags}|%{build_cflags}|' \ -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \ -e 's|%%{build_ldflags}|%{build_ldflags}|' \ - %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json + %{SOURCE5} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf @@ -91,18 +82,10 @@ glib-compile-schemas /app/share/glib-2.0/schemas &> /dev/null || : %transfiletriggerin -- /app/share/fonts HOME=/root /usr/bin/fc-cache -s -%transfiletriggerin -- /app/share/java -for d in `find /app/share/java -type d`; do mkdir -p /usr${d#/app}; done -for f in `find /app/share/java ! -type d`; do ln -s $f /usr${f#/app}; done - -%transfiletriggerin -P 1 -- /app -for l in `find /app -type l`; do \ - case `readlink $l` in /etc/alternatives/*) ln -fns `readlink -f $l` $l ;; esac \ -done - %files %dir %{_prefix}/cache %dir %{_prefix}/cache/fontconfig +%{python2_sitelib} %{python3_sitelib} %{_datadir}/metainfo/*.appdata.xml %{_sysconfdir}/flatpak-builder/ @@ -110,68 +93,21 @@ done %{_sysconfdir}/ld.so.conf.d/app.conf %changelog -* Wed Oct 15 2025 Tomas Popela - 40-5 -- Fix release date and version in the AppStream data - Resolves: RHEL-121458 +* Wed Oct 15 2025 Tomas Popela - 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 -* Tue Oct 29 2024 Troy Dawson - 40-4 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 +* Fri Mar 24 2023 Tomas Popela - 34-3 +- Sync with Fedora +- Add a seed for

fonts (by tagoh) -* Sat Jun 08 2024 Owen Taylor - 40-3 -- Adapt to centos-stream and RHEL for el10 - -* Mon Jun 24 2024 Troy Dawson - 40-2 -- Bump release for June 2024 mass rebuild - -* Wed Apr 03 2024 Yaakov Selkowitz - 40-1 -- Bump version - -* Fri Mar 01 2024 Yaakov Selkowitz - 39-6 -- Add Java symlink trigger -- Add /app-built X11 font directories to fontconfig path -- Add alternatives symlink trigger - -* Fri Dec 15 2023 Yaakov Selkowitz - 39-5 -- Add graphviz install trigger - -* Thu Oct 05 2023 Kalev Lember - 39-4 -- appdata: Add F39 versions - -* Mon Sep 04 2023 Yaakov Selkowitz - 39-3 -- Provide sitecustomize instead of usercustomize - -* Tue Aug 22 2023 Owen Taylor - 39-2 -- Bump for rebuild - -* Mon Aug 7 2023 Owen Taylor - 39-1 -- Bump version - -* Sat Mar 18 2023 Kalev Lember - 38-1 -- appdata: Add F38 versions -- Revert "Provide systemd packages" - -* Tue Feb 21 2023 Yaakov Selkowitz - 37-4 -- Add metainfo for KDE runtimes - -* Tue Feb 21 2023 Yaakov Selkowitz - 37-3 -- Remove package notes from flatpak-builder compile flags - -* Tue Sep 06 2022 Kalev Lember - 37-2 -- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags -- Revert "Fix search paths for /app-installed python modules" (#2026979) - -* Wed Aug 17 2022 Kalev Lember - 37-1 -- appdata: Add F37 versions - -* Thu Aug 04 2022 Kalev Lember - 36-2 -- Fix search paths for /app-installed python modules (#2112499) - -* Mon May 02 2022 Tomas Popela - 36-1 -- appdata: Add F36 versions - -* Thu Sep 30 2021 Kalev Lember - 35-1 -- appdata: Add F35 versions +* Fri Mar 17 2023 Tomas Popela - 34-2 +- Sync with Fedora +- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags (by klember) +- Include fonts-dirs.xml in fontconfig flatpak configuration (by tagoh) +- Add 05-flatpak-fontpath.conf that forces a different MD5 for fontconfig cache to avoid + conflict between caches on host and flatpak (by tagoh) * Tue Feb 02 2021 Kalev Lember - 34-1 - Install flatpak-builder defaults.json config file diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index d353613..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/org.centos.stream.Platform.appdata.xml b/org.centos.stream.Platform.appdata.xml deleted file mode 100644 index 373f530..0000000 --- a/org.centos.stream.Platform.appdata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.centos.stream.Platform - CC0-1.0 - https://www.centos.org/legal/licensing-policy/ - Centos Stream Platform - Shared libraries - - - - -

- The Centos Stream Platform is a runtime for Flatpak applications. - It contains common libraries that are shared between desktop applications, including - GTK 3, GStreamer, Qt 5, Mesa, SDL2, and many others. -

- - https://www.centos.org/centos-stream/ - diff --git a/org.centos.stream.Sdk.appdata.xml b/org.centos.stream.Sdk.appdata.xml deleted file mode 100644 index 8967a34..0000000 --- a/org.centos.stream.Sdk.appdata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.centos.stream.Sdk - CC0-1.0 - https://www.centos.org/legal/licensing-policy/ - Centos Stream SDK - Tools and headers for developing applications - - - - -

- The Centos Stream Sdk is the development runtime that you can use to produce applications - using the Centos Stream runtime. It contains everything that is in the platform, as well - as build and debugging tools and headers for the libraries. -

- - https://www.centos.org/centos-stream/ - diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000