rpms/ibus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Enhance package dependencies

Browse Source 
- Use __python3 instead of python3
- Use Recommends dependencies instead of Requires ones for Flatpak
This commit is contained in:
Takao Fujiwara 2018-10-18 16:49:02 +09:00
parent ed8c51ca3a
commit 46dfb4a035
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ibus.spec
View File

@ -1,7 +1,7 @@
%if (0%{?fedora} || 0%{?rhel} <= 7) %if (0%{?fedora} > 29 || 0%{?rhel} > 7)
%global with_python2 1
%else
%global with_python2 0 %global with_python2 0
%else
%global with_python2 1
%endif %endif
%global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0") %global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0")
@ -31,7 +31,7 @@
Name: ibus Name: ibus
Version: 1.5.19 Version: 1.5.19
Release: 4%{?dist} Release: 5%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -94,7 +94,7 @@ Requires: dconf
# Owner of %%python3_sitearch/gi/overrides # Owner of %%python3_sitearch/gi/overrides
Requires: python3-gobject Requires: python3-gobject
# https://bugzilla.redhat.com/show_bug.cgi?id=1161871 # https://bugzilla.redhat.com/show_bug.cgi?id=1161871
Requires: python3 %{?__python3:Requires: %{__python3}}
# Owner of %%{_sysconfdir}/X11/xinit # Owner of %%{_sysconfdir}/X11/xinit
Requires: xorg-x11-xinit Requires: xorg-x11-xinit
# for setxkbmap # for setxkbmap
@ -131,7 +131,7 @@ This package contains the libraries for IBus
%package gtk2 %package gtk2
Summary: IBus IM module for GTK2 Summary: IBus IM module for GTK2
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: glib2 >= %{glib_ver} Requires: glib2 >= %{glib_ver}
Requires(post): glib2 >= %{glib_ver} Requires(post): glib2 >= %{glib_ver}
@ -145,7 +145,7 @@ This package contains IBus IM module for GTK2
%package gtk3 %package gtk3
Summary: IBus IM module for GTK3 Summary: IBus IM module for GTK3
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: glib2 >= %{glib_ver} Requires: glib2 >= %{glib_ver}
Requires(post): glib2 >= %{glib_ver} Requires(post): glib2 >= %{glib_ver}
@ -156,8 +156,8 @@ This package contains IBus IM module for GTK3
%package setup %package setup
Summary: IBus setup utility Summary: IBus setup utility
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Recommends: %{name} = %{version}-%{release}
Requires: python3 %{?__python3:Requires: %{__python3}}
Requires: python3-gobject Requires: python3-gobject
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: pygobject3-devel BuildRequires: pygobject3-devel
@ -170,7 +170,7 @@ This is a setup utility for IBus.
%package pygtk2 %package pygtk2
Summary: IBus PyGTK2 library Summary: IBus PyGTK2 library
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Recommends: %{name} = %{version}-%{release}
%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7)
Requires: dbus-python >= %{dbus_python_version} Requires: dbus-python >= %{dbus_python_version}
%else %else
@ -204,7 +204,7 @@ some functions in GObject-Introspection.
%package wayland %package wayland
Summary: IBus IM module for Wayland Summary: IBus IM module for Wayland
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description wayland %description wayland
@ -213,7 +213,7 @@ This package contains IBus IM module for Wayland
%package devel %package devel
Summary: Development tools for ibus Summary: Development tools for ibus
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: dbus-devel Requires: dbus-devel
Requires: glib2-devel Requires: glib2-devel
@ -230,10 +230,10 @@ docs for ibus.
Summary: Developer documents for IBus Summary: Developer documents for IBus
Group: Development/Libraries Group: Development/Libraries
%if (0%{?fedora} >= 19 || 0%{?rhel} >= 7) %if (0%{?fedora} >= 19 || 0%{?rhel} >= 7)
Requires: %{name} = %{version}-%{release} Recommends: %{name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%else %else
Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
%endif %endif
%description devel-docs %description devel-docs
@ -428,6 +428,10 @@ dconf update || :
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Thu Oct 18 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-5
- Use __python3 instead of python3
- Use Recommends dependencies instead of Requires ones for Flatpak
* Fri Sep 14 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-4 * Fri Sep 14 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.19-4
- Fix Bug SEGV Choose an emoji by mouse from the emoji category list - Fix Bug SEGV Choose an emoji by mouse from the emoji category list