From dc055027deff70dd453261dfe182b4493da9950b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 18 May 2018 13:24:25 +0200 Subject: [PATCH] Trivial fixes to sync with RHEL packaging --- gnome-shell.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnome-shell.spec b/gnome-shell.spec index e39c175..406edbb 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -32,6 +32,7 @@ Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch %define gsettings_desktop_schemas_version 3.21.3 %define ibus_version 1.5.2 %define gnome_bluetooth_version 1:3.9.0 +%define gstreamer_version 1.4.5 BuildRequires: meson BuildRequires: git @@ -54,7 +55,7 @@ BuildRequires: startup-notification-devel # for theme generation BuildRequires: sassc # for screencast recorder functionality -BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-devel >= %{gstreamer_version} BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gettext >= 0.19.6 BuildRequires: libcanberra-devel @@ -77,7 +78,10 @@ BuildRequires: gtk-doc Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} %endif Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} +%if 0%{?fedora} +# Disabled on RHEL to allow logging into KDE session by default Requires: gnome-session-xsession +%endif # wrapper script uses to restart old GNOME session if run --replace # from the command line Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} @@ -99,6 +103,7 @@ Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas Requires: libcroco%{?_isa} >= %{libcroco_version} Requires: telepathy-logger%{?_isa} Requires: telepathy-glib%{?_isa} +Requires: gstreamer1%{?_isa} >= %{gstreamer_version} # needed for schemas Requires: at-spi2-atk%{?_isa} # needed for on-screen keyboard