diff --git a/.gitignore b/.gitignore index 0d043ca..484e974 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gnome-kiosk-40.0.tar.xz /gnome-kiosk-41.beta.tar.xz /gnome-kiosk-41.0.tar.xz +/gnome-kiosk-42.alpha.tar.xz diff --git a/gnome-kiosk-41.0-mutter-42.patch b/gnome-kiosk-41.0-mutter-42.patch deleted file mode 100644 index 9033f51..0000000 --- a/gnome-kiosk-41.0-mutter-42.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c4bb6ee0674e4fe3355945cfb0bc20765c592bd3 Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 17 Jan 2022 08:05:18 +0000 -Subject: [PATCH] meson: Build against mutter 42 - -Fixes: https://gitlab.gnome.org/GNOME/gnome-kiosk/-/issues/1 ---- - meson.build | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index c47215b..8fcca06 100644 ---- a/meson.build -+++ b/meson.build -@@ -34,7 +34,7 @@ config_h = configure_file( - - meson.add_install_script ('meson/postinstall.py') - --mutter_dependency = dependency('libmutter-9') -+mutter_dependency = dependency('libmutter-10') - mutter_libdir = mutter_dependency.get_pkgconfig_variable('typelibdir') - - systemd_user_unit_dir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir', -@@ -103,9 +103,9 @@ compositor_dependencies += dependency('glib-2.0') - compositor_dependencies += dependency('gnome-desktop-3.0') - compositor_dependencies += dependency('gobject-2.0') - compositor_dependencies += dependency('ibus-1.0') --compositor_dependencies += dependency('mutter-cogl-9') --compositor_dependencies += dependency('mutter-cogl-pango-9') --compositor_dependencies += dependency('mutter-clutter-9') -+compositor_dependencies += dependency('mutter-cogl-10') -+compositor_dependencies += dependency('mutter-cogl-pango-10') -+compositor_dependencies += dependency('mutter-clutter-10') - compositor_dependencies += mutter_dependency - compositor_dependencies += systemd_dependency - --- -2.34.1 - diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec index 46f7afa..f926b34 100644 --- a/gnome-kiosk.spec +++ b/gnome-kiosk.spec @@ -11,15 +11,13 @@ %global gnome_settings_daemon_version 40~rc Name: gnome-kiosk -Version: 41.0 -Release: 3%{?dist} +Version: 42~alpha +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ URL: https://gitlab.gnome.org/GNOME/gnome-kiosk Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=2040955 -Patch0: gnome-kiosk-41.0-mutter-42.patch Provides: firstboot(windowmanager) = %{name} @@ -106,6 +104,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc %{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop %changelog +* Mon Jan 24 2022 David King - 42~alpha-1 +- Update to 42.alpha + * Thu Jan 20 2022 Fedora Release Engineering - 41.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index f015ae3..08000dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-kiosk-41.0.tar.xz) = 79152bcae2542ca6ddc3c66c523cfa7dacfe3c805079fad41eac3d5c2928e6ed8adfe4c0029e53caf933370a4b87ab87e8440ae3cdde8b60626eb93a010d4522 +SHA512 (gnome-kiosk-42.alpha.tar.xz) = 892a34506fc8f73f1fc3fe952e060caf76d5cf947a5500f94cc71273d5d0e18d25b60f0890882f531d5c5157d1402ca8e067c8d1471c78bf35285540c6bcb249