Update versioned requires

... and sort them in the same order as they appear in meson.build.
This commit is contained in:
Kalev Lember 2018-05-18 12:42:26 +02:00
parent f1407349fc
commit 82b7b11740

View File

@ -19,18 +19,19 @@ Patch2: 0001-keyboardManager-Preserve-current-keymap-across-reloa.patch
Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch Patch3: 0001-networkAgent-Fix-fallout-from-libnm-port.patch
%define gnome_bluetooth_version 1:3.9.0 %define libcroco_version 0.6.8
%define gobject_introspection_version 1.45.4 %define eds_version 3.17.2
%define gjs_version 1.51.90
%define mutter_version 3.29.1
%define gtk3_version 3.15.0
%define eds_version 3.13.90
%define gnome_desktop_version 3.7.90 %define gnome_desktop_version 3.7.90
%define glib2_version 2.56.0
%define gobject_introspection_version 1.49.1
%define gjs_version 1.51.90
%define gtk3_version 3.15.0
%define json_glib_version 0.13.2 %define json_glib_version 0.13.2
%define mutter_version 3.29.1
%define polkit_version 0.100
%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 libcroco_version 0.6.8 %define gnome_bluetooth_version 1:3.9.0
%define telepathy_logger_version 0.2.6
BuildRequires: meson BuildRequires: meson
BuildRequires: git BuildRequires: git
@ -41,14 +42,14 @@ BuildRequires: desktop-file-utils
BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: evolution-data-server-devel >= %{eds_version}
BuildRequires: gcr-devel BuildRequires: gcr-devel
BuildRequires: gjs-devel >= %{gjs_version} BuildRequires: gjs-devel >= %{gjs_version}
BuildRequires: glib2-devel BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gobject-introspection >= %{gobject_introspection_version} BuildRequires: gobject-introspection >= %{gobject_introspection_version}
BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: json-glib-devel >= %{json_glib_version}
BuildRequires: upower-devel BuildRequires: upower-devel
BuildRequires: libgnome-keyring-devel BuildRequires: libgnome-keyring-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
BuildRequires: NetworkManager-libnm-devel BuildRequires: NetworkManager-libnm-devel
BuildRequires: polkit-devel BuildRequires: polkit-devel >= %{polkit_version}
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
# for theme generation # for theme generation
BuildRequires: sassc BuildRequires: sassc
@ -91,11 +92,12 @@ Requires: json-glib%{?_isa} >= %{json_glib_version}
Requires: mozilla-filesystem%{?_isa} Requires: mozilla-filesystem%{?_isa}
Requires: mutter%{?_isa} >= %{mutter_version} Requires: mutter%{?_isa} >= %{mutter_version}
Requires: upower%{?_isa} Requires: upower%{?_isa}
Requires: polkit%{?_isa} >= 0.100 Requires: polkit%{?_isa} >= %{polkit_version}
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
Requires: libcroco%{?_isa} >= %{libcroco_version} Requires: libcroco%{?_isa} >= %{libcroco_version}
Requires: telepathy-logger%{?_isa} >= %{telepathy_logger_version} Requires: telepathy-logger%{?_isa}
Requires: telepathy-glib%{?_isa} Requires: telepathy-glib%{?_isa}
# needed for schemas # needed for schemas
Requires: at-spi2-atk%{?_isa} Requires: at-spi2-atk%{?_isa}