Trivial fixes to sync with RHEL packaging

This commit is contained in:
Kalev Lember 2018-05-18 13:24:25 +02:00
parent 82b7b11740
commit dc055027de

View File

@ -32,6 +32,7 @@ Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch
%define gsettings_desktop_schemas_version 3.21.3 %define gsettings_desktop_schemas_version 3.21.3
%define ibus_version 1.5.2 %define ibus_version 1.5.2
%define gnome_bluetooth_version 1:3.9.0 %define gnome_bluetooth_version 1:3.9.0
%define gstreamer_version 1.4.5
BuildRequires: meson BuildRequires: meson
BuildRequires: git BuildRequires: git
@ -54,7 +55,7 @@ BuildRequires: startup-notification-devel
# for theme generation # for theme generation
BuildRequires: sassc BuildRequires: sassc
# for screencast recorder functionality # for screencast recorder functionality
BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-devel >= %{gstreamer_version}
BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: gettext >= 0.19.6 BuildRequires: gettext >= 0.19.6
BuildRequires: libcanberra-devel BuildRequires: libcanberra-devel
@ -77,7 +78,10 @@ BuildRequires: gtk-doc
Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
%endif %endif
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} 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 Requires: gnome-session-xsession
%endif
# wrapper script uses to restart old GNOME session if run --replace # wrapper script uses to restart old GNOME session if run --replace
# from the command line # from the command line
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} 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: libcroco%{?_isa} >= %{libcroco_version}
Requires: telepathy-logger%{?_isa} Requires: telepathy-logger%{?_isa}
Requires: telepathy-glib%{?_isa} Requires: telepathy-glib%{?_isa}
Requires: gstreamer1%{?_isa} >= %{gstreamer_version}
# needed for schemas # needed for schemas
Requires: at-spi2-atk%{?_isa} Requires: at-spi2-atk%{?_isa}
# needed for on-screen keyboard # needed for on-screen keyboard