Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gnome-kiosk for openSUSE:Factory 
checked in at 2022-02-11 23:07:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-kiosk (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-kiosk.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-kiosk"

Fri Feb 11 23:07:36 2022 rev:2 rq:953325 version:41.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-kiosk/gnome-kiosk.changes  2022-01-11 
21:24:34.997183076 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-kiosk.new.1956/gnome-kiosk.changes        
2022-02-11 23:09:11.990909586 +0100
@@ -1,0 +2,9 @@
+Wed Feb  2 21:26:51 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add gnome-kiosk-fix-meson-061.patch: Fix build with meson 0.61
+  and newer.
+- Add fdupes BuildRequires and macro, remove duplicates.
+- Split out gnome-kiosk-sample-app and add a hard Requires on
+  MozillaFirefox, needed for the sample app.
+
+-------------------------------------------------------------------

New:
----
  gnome-kiosk-fix-meson-061.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-kiosk.spec ++++++
--- /var/tmp/diff_new_pack.kXWKAO/_old  2022-02-11 23:09:12.410910801 +0100
+++ /var/tmp/diff_new_pack.kXWKAO/_new  2022-02-11 23:09:12.422910835 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-kiosk
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,6 +23,10 @@
 License:        GPL-2.0-or-later
 URL:            https://gitlab.gnome.org/GNOME/gnome-kiosk
 Source:         
https://download.gnome.org/sources/gnome-kiosk/41/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-kiosk-fix-meson-061.patch [email protected] -- 
Fix build with meson 0.61 and newer
+Patch:          gnome-kiosk-fix-meson-061.patch
+
+BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  mutter-devel
 BuildRequires:  pkgconfig
@@ -38,8 +42,17 @@
 Kiosk provides a desktop enviroment suitable for fixed purpose, or single
 application deployments like wall displays and point-of-sale systems.
 
+%package sample-app
+Summary:        Search appliance sample app
+Requires:       %{name} = %{version}
+Requires:       MozillaFirefox
+
+%description sample-app
+Search appliance sample app that demonstate how the kiosk
+compositor is used.
+
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 %meson
@@ -47,6 +60,7 @@
 
 %install
 %meson_install
+%fdupes -s %{buildroot}%{_datadir}
 
 %files
 %license COPYING
@@ -59,16 +73,18 @@
 %{_userunitdir}/[email protected]
 %{_userunitdir}/[email protected]
 %{_datadir}/applications/org.gnome.Kiosk.Script.desktop
-%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop
 %{_datadir}/applications/org.gnome.Kiosk.desktop
 %dir %{_datadir}/gnome-session
 %dir %{_datadir}/gnome-session/sessions
 %{_datadir}/gnome-session/sessions/gnome-kiosk-script.session
-%{_datadir}/gnome-session/sessions/org.gnome.Kiosk.SearchApp.session
 %dir %{_datadir}/wayland-sessions
 %{_datadir}/wayland-sessions/gnome-kiosk-script-wayland.desktop
-%{_datadir}/wayland-sessions/org.gnome.Kiosk.SearchApp.Session.desktop
 %{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop
+
+%files sample-app
+%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop
+%{_datadir}/gnome-session/sessions/org.gnome.Kiosk.SearchApp.session
+%{_datadir}/wayland-sessions/org.gnome.Kiosk.SearchApp.Session.desktop
 %{_datadir}/xsessions/org.gnome.Kiosk.SearchApp.Session.desktop
 
 %changelog

++++++ gnome-kiosk-fix-meson-061.patch ++++++
diff -Nur orig-gnome-kiosk-41.0/meson.build gnome-kiosk-41.0/meson.build
--- orig-gnome-kiosk-41.0/meson.build   2022-02-10 19:30:05.416328516 +0100
+++ gnome-kiosk-41.0/meson.build        2022-02-10 19:34:13.867701231 +0100
@@ -142,7 +142,7 @@
         configuration: desktop_config_data
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: desktop_file,
         output: 'org.gnome.Kiosk.desktop',
         po_dir: po_dir,
@@ -183,7 +183,7 @@
         configuration: desktop_config_data
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: desktop_file,
         output: 'org.gnome.Kiosk.Script.desktop',
         po_dir: po_dir,
@@ -208,7 +208,7 @@
         install_dir: session_dir,
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 'kiosk-script/xsessions/gnome-kiosk-script-xorg.desktop.in',
         output: '@BASENAME@',
         po_dir: po_dir,
@@ -217,7 +217,7 @@
         type: 'desktop'
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 
'kiosk-script/wayland-sessions/gnome-kiosk-script-wayland.desktop.in',
         output: '@BASENAME@',
         po_dir: po_dir,
@@ -237,7 +237,7 @@
 
 subdir('input-selector')
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: session_file,
         output: 'org.gnome.Kiosk.SearchApp.session',
         po_dir: po_dir,
@@ -246,7 +246,7 @@
         type: 'desktop'
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 'search-app/org.gnome.Kiosk.SearchApp.Session.desktop.in',
         output: 'org.gnome.Kiosk.SearchApp.Session.desktop',
         po_dir: po_dir,
@@ -261,7 +261,7 @@
         configuration: desktop_config_data
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: search_app_desktop_file,
         output: 'org.gnome.Kiosk.SearchApp.desktop',
         po_dir: po_dir,

Reply via email to