dbus-x11 is not required in Fedora 30

- Add Conflicts for Fedora 28
This commit is contained in:
Takao Fujiwara 2018-10-29 18:00:31 +09:00
parent 0f47884d29
commit b0845dabef

View File

@ -31,7 +31,7 @@
Name: ibus
Version: 1.5.19
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@ -87,7 +87,6 @@ Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
Requires: %{name}-setup = %{version}-%{release}
Requires: iso-codes
Requires: dbus-x11
Requires: dconf
# rpmlint asks to delete librsvg2
#Requires: librsvg2
@ -99,6 +98,10 @@ Requires: python3-gobject
Requires: xorg-x11-xinit
# for setxkbmap
Requires: xorg-x11-xkb-utils
%if (0%{?fedora} > 29 || 0%{?rhel} > 8)
%else
Requires: dbus-x11
%endif
Requires: desktop-file-utils
Requires(post): desktop-file-utils
@ -124,6 +127,10 @@ Requires: dbus >= 1.2.4
Requires: glib2 >= %{glib_ver}
# Owner of %%{_libdir}/girepository-1.0
Requires: gobject-introspection
%if (0%{?fedora} > 28 || 0%{?rhel} > 7)
%else
Conflicts: %{name}%{?_isa} < %{version}
%endif
%description libs
This package contains the libraries for IBus
@ -417,6 +424,10 @@ dconf update || :
%{_datadir}/gtk-doc/html/*
%changelog
* Fri Oct 26 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-6
- dbus-x11 is not required in Fedora 30
- Add Conflicts for Fedora 28
* Tue Oct 23 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-5
- Use __python3 instead of python3
- Delete Requires ibus in ibus-gtk* for Flatpak