Compare commits
No commits in common. "c9-beta" and "c9s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/gnome-kiosk-40.0.tar.xz
|
||||
/gnome-kiosk-40.alpha.tar.xz
|
||||
/gnome-kiosk-40.0.tar.xz
|
||||
|
@ -1 +0,0 @@
|
||||
7299ed3df18e96a6258a22e88b6418dc578ac8bb SOURCES/gnome-kiosk-40.0.tar.xz
|
64
0001-search-app-Add-systemd-session-files.patch
Normal file
64
0001-search-app-Add-systemd-session-files.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From e0a8d2005c68a4b2ca1543149f50c03c3c7c0b5f Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||
Date: Tue, 4 Mar 2025 16:21:30 +0100
|
||||
Subject: [PATCH 1/2] search-app: Add systemd session files
|
||||
|
||||
The search appliance session would fail to start as a systemd session.
|
||||
|
||||
Add the required systemd plumbing to fix the search appliance session.
|
||||
|
||||
(cherry picked from commit 5308432e1c564ec096acbb3f4fb19f940d6c2ae9)
|
||||
---
|
||||
meson.build | 12 ++++++++++++
|
||||
.../systemd/org.gnome.Kiosk.SearchApp.service.in | 8 ++++++++
|
||||
search-app/systemd/session.conf | 3 +++
|
||||
3 files changed, 23 insertions(+)
|
||||
create mode 100644 search-app/systemd/org.gnome.Kiosk.SearchApp.service.in
|
||||
create mode 100644 search-app/systemd/session.conf
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 0766f8d..e3d8ff3 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -188,3 +188,15 @@ i18n.merge_file('desktop',
|
||||
install_dir: desktop_data_dir,
|
||||
type: 'desktop'
|
||||
)
|
||||
+
|
||||
+configure_file(
|
||||
+ input: 'search-app/systemd/org.gnome.Kiosk.SearchApp.service.in',
|
||||
+ output: '@BASENAME@',
|
||||
+ configuration: systemd_service_config_data,
|
||||
+ install_dir: systemd_user_unit_dir
|
||||
+)
|
||||
+
|
||||
+kiosk_search_appliance_systemd_target_dir = join_paths(systemd_user_unit_dir, 'gnome-session@org.gnome.Kiosk.SearchApp.target.d')
|
||||
+install_data('search-app/systemd/session.conf',
|
||||
+ install_dir: kiosk_search_appliance_systemd_target_dir
|
||||
+)
|
||||
diff --git a/search-app/systemd/org.gnome.Kiosk.SearchApp.service.in b/search-app/systemd/org.gnome.Kiosk.SearchApp.service.in
|
||||
new file mode 100644
|
||||
index 0000000..29ddcd8
|
||||
--- /dev/null
|
||||
+++ b/search-app/systemd/org.gnome.Kiosk.SearchApp.service.in
|
||||
@@ -0,0 +1,8 @@
|
||||
+[Unit]
|
||||
+Description=Kiosk Search Appliance
|
||||
+BindsTo=gnome-session.target
|
||||
+After=gnome-session.target
|
||||
+
|
||||
+[Service]
|
||||
+ExecStart=@bindir@/firefox --kiosk --private-window --new-instance https://www.google.com
|
||||
+Restart=always
|
||||
diff --git a/search-app/systemd/session.conf b/search-app/systemd/session.conf
|
||||
new file mode 100644
|
||||
index 0000000..1ab41da
|
||||
--- /dev/null
|
||||
+++ b/search-app/systemd/session.conf
|
||||
@@ -0,0 +1,3 @@
|
||||
+[Unit]
|
||||
+Requires=org.gnome.Kiosk.target
|
||||
+Requires=org.gnome.Kiosk.SearchApp.service
|
||||
--
|
||||
2.48.1
|
||||
|
30
0002-search-app-Update-desktop-file-definition.patch
Normal file
30
0002-search-app-Update-desktop-file-definition.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From a94bce8532d6f9f9fb1fd888e54803220a733765 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||
Date: Wed, 5 Mar 2025 14:23:49 +0100
|
||||
Subject: [PATCH 2/2] search-app: Update desktop file definition
|
||||
|
||||
Firefox itself has nothing to do with neither Gtk or GNOME, no need to
|
||||
list those in the categories.
|
||||
|
||||
(cherry picked from commit 7f6defb5d1afd4aeee55d286256879118ba9c008)
|
||||
---
|
||||
search-app/org.gnome.Kiosk.SearchApp.desktop.in.in | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in b/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
|
||||
index 40a8669..7d85d56 100644
|
||||
--- a/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
|
||||
+++ b/search-app/org.gnome.Kiosk.SearchApp.desktop.in.in
|
||||
@@ -3,7 +3,6 @@ Type=Application
|
||||
Name=Search Appliance
|
||||
Comment=Sample Search Appliance Application for GNOME Kiosk
|
||||
Exec=@bindir@/firefox --kiosk --private-window --new-instance http://www.google.com
|
||||
-Categories=GNOME;GTK;Core;
|
||||
-OnlyShowIn=GNOME;
|
||||
+Categories=Core;System;
|
||||
NoDisplay=true
|
||||
-X-GNOME-AutoRestart=true
|
||||
+X-GNOME-HiddenUnderSystemd=true
|
||||
--
|
||||
2.48.1
|
||||
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
@ -12,7 +12,7 @@
|
||||
|
||||
Name: gnome-kiosk
|
||||
Version: 40.0
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
License: GPLv2+
|
||||
@ -53,6 +53,9 @@ Patch30001: 0001-compositor-Be-more-permissive-about-what-s-considere.patch
|
||||
# https://issues.redhat.com/browse/RHEL-25536
|
||||
Patch40001: 0001-input-selector-Add-missing-dependency-on-gio-unix-2..patch
|
||||
Patch40002: 0001-kiosk-script-Copy-and-run-the-script-from-XDG_RUNTIM.patch
|
||||
# https://issues.redhat.com/browse/RHEL-84004
|
||||
Patch50001: 0001-search-app-Add-systemd-session-files.patch
|
||||
Patch50002: 0002-search-app-Update-desktop-file-definition.patch
|
||||
|
||||
%description
|
||||
GNOME Kiosk provides a desktop enviroment suitable for fixed purpose, or
|
||||
@ -113,12 +116,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
|
||||
%{_datadir}/xsessions/gnome-kiosk-script.desktop
|
||||
|
||||
%files -n gnome-kiosk-search-appliance
|
||||
%{_userunitdir}/gnome-session@org.gnome.Kiosk.SearchApp.target.d/session.conf
|
||||
%{_userunitdir}/org.gnome.Kiosk.SearchApp.service
|
||||
%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop
|
||||
%{_datadir}/gnome-session/sessions/org.gnome.Kiosk.SearchApp.session
|
||||
%{_datadir}/xsessions/org.gnome.Kiosk.SearchApp.Session.desktop
|
||||
%{_datadir}/wayland-sessions/org.gnome.Kiosk.SearchApp.Session.desktop
|
||||
|
||||
%changelog
|
||||
* Tue Mar 18 2025 Olivier Fourdan <ofourdan@redhat.com> - 40.0-7
|
||||
- search-app: Add systemd session files
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-84004
|
||||
|
||||
* Wed Dec 18 2024 Ray Strode <rstrode@redhat.com> - 40.0-6
|
||||
- Copy and run the script from XDG_RUNTIME_DIR
|
||||
Resolves: https://issues.redhat.com/browse/RHEL-25536
|
3
rpminspect.yaml
Normal file
3
rpminspect.yaml
Normal file
@ -0,0 +1,3 @@
|
||||
inspections:
|
||||
desktop: off
|
||||
runpath: off
|
Loading…
Reference in New Issue
Block a user