From d094aa2ccfd1f05e5b5d66eda54f2f649eb077c9 Mon Sep 17 00:00:00 2001
From: importbot <releng@rockylinux.org>
Date: Thu, 19 Dec 2024 01:48:44 +0000
Subject: [PATCH] import gnome-kiosk-47.0-4.el10
---
...-search-app-Use-firefox-from-flatpak.patch | 29 +++++++++++++++++++
SPECS/gnome-kiosk.spec | 11 +++++--
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 SOURCES/0001-search-app-Use-firefox-from-flatpak.patch
diff --git a/SOURCES/0001-search-app-Use-firefox-from-flatpak.patch b/SOURCES/0001-search-app-Use-firefox-from-flatpak.patch
new file mode 100644
index 0000000..d9a9c95
--- /dev/null
+++ b/SOURCES/0001-search-app-Use-firefox-from-flatpak.patch
@@ -0,0 +1,29 @@
+From fb932adc99bb0b73567674ff905782a642b9b12e Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu, 12 Dec 2024 14:05:04 +0100
+Subject: [PATCH] search-app: Use firefox from flatpak
+
+Firefox is being installed through flatpak these days, adjust the search
+appliance to use flatpak instead of invoking firefox directly.
+
+https://issues.redhat.com/browse/RHEL-36521
+---
+ search-app/org.gnome.Kiosk.SearchApp.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in b/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
+index 360e6df..4416353 100644
+--- a/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
++++ b/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=Search Appliance
+ Comment=Sample Search Appliance Application for GNOME Kiosk
+-Exec=@bindir@/firefox --kiosk --private-window --new-instance https://www.google.com
++Exec=@bindir@/flatpak run --command=firefox --file-forwarding org.mozilla.firefox --kiosk --private-window --new-instance https://www.google.com
+ Categories=GNOME;GTK;Core;
+ OnlyShowIn=GNOME;
+ NoDisplay=true
+--
+2.47.1
+
diff --git a/SPECS/gnome-kiosk.spec b/SPECS/gnome-kiosk.spec
index 57c46b6..580f3ab 100644
--- a/SPECS/gnome-kiosk.spec
+++ b/SPECS/gnome-kiosk.spec
@@ -1,8 +1,8 @@
## START: Set by rpmautospec
-## (rpmautospec version 0.7.2)
+## (rpmautospec version 0.7.3)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
- release_number = 3;
+ release_number = 4;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -50,7 +50,9 @@ BuildRequires: pkgconfig(libmutter-15) >= %{mutter_version}
Requires: gnome-settings-daemon%{?_isa} >= %{gnome_settings_daemon_version}
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
-Patch: 0001-kiosk-app-Do-not-add-the-window-in-kiosk_app_new_for.patch
+Patch0: 0001-kiosk-app-Do-not-add-the-window-in-kiosk_app_new_for.patch
+# https://issues.redhat.com/browse/RHEL-36521
+Patch1: 0001-search-app-Use-firefox-from-flatpak.patch
%description
GNOME Kiosk provides a desktop enviroment suitable for fixed purpose, or
@@ -118,6 +120,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%changelog
## START: Generated by rpmautospec
+* Wed Dec 18 2024 Olivier Fourdan <ofourdan@redhat.com> - 47.0-4
+- Use firefox from flatpak
+
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 47.0-3
- Bump release for October 2024 mass rebuild:
--
GitLab