Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-shell.git#00d99b423cb5216cd60bb9624ff48bf0d129caf5
This commit is contained in:
DistroBaker 2021-03-19 21:13:12 +00:00
parent 13d8dd4ce4
commit 53f1d8342e
4 changed files with 15 additions and 32 deletions

1
.gitignore vendored
View File

@ -189,3 +189,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz
/gnome-shell-40.beta.tar.xz
/gnome-shell-40.beta-79-g7a57528bd.tar.xz
/gnome-shell-40.rc.tar.xz

View File

@ -1,25 +0,0 @@
From 7649d0c93dddfa6969e432c2510379aa5cf70420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 4 Mar 2021 16:36:05 +0100
Subject: [PATCH] build: Lower mutter requirement
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 66c0fc073..5654a8838 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@ gio_req = '>= 2.56.0'
gi_req = '>= 1.49.1'
gjs_req = '>= 1.65.1'
gtk_req = '>= 3.15.0'
-mutter_req = '>= 40.rc'
+mutter_req = '>= 40.beta'
polkit_req = '>= 0.100'
schemas_req = '>= 3.33.1'
startup_req = '>= 0.11'
--
2.30.1

View File

@ -1,16 +1,14 @@
Name: gnome-shell
Version: 40.0~beta
Release: 2.20210304git7a57528bd%{?dist}
Version: 40.0~rc
Release: 1%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeShell
Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.beta-79-g7a57528bd.tar.xz
Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.rc.tar.xz
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
# Undo post-release version bump for snapshot
Patch2: 0001-build-Lower-mutter-requirement.patch
%define eds_version 3.33.1
%define gnome_desktop_version 3.35.91
@ -75,7 +73,7 @@ Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
%if 0%{?rhel} != 7
# Disabled on RHEL 7 to allow logging into KDE session by default
Requires: gnome-session-xsession
Recommends: gnome-session-xsession
%endif
# wrapper script uses to restart old GNOME session if run --replace
# from the command line
@ -225,6 +223,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1*
%changelog
* Mon Mar 15 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~rc-1
- Update to 40.rc
* Thu Mar 11 2021 Kalev Lember <klember@redhat.com> - 40.0~beta-4.20210304git7a57528bd
- Recommend gnome-session-xsession rather than hard-require it
* Mon Mar 08 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-3.20210304git40.7a57528bd
- Fix crash after launching apps via drag-and-drop
* Thu Mar 04 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-2.20210304git40.7a57528bd
- Build snapshot of current upstream

View File

@ -1 +1 @@
SHA512 (gnome-shell-40.beta-79-g7a57528bd.tar.xz) = 2886a18bf75fec069be00170f1f646ac0d06c8aeb0cc7f03b221c1c77490877cb2914391c0f2297a6b8b496e4fda292e89eaf65d8c660bcbe12f961d36adccb6
SHA512 (gnome-shell-40.rc.tar.xz) = 9646cac912f3c6e7ae61c60cfb551a1be4c09fa6e3a2db2ca4e5ce117cac0f624a0c44cfd6ab551ab1e4e9e086856dca78347bec1bff3c05ed7741d15c55afd1