[ibus] Removed dependencies of ibus-setup and ibus-pygtk2
Takao Fujiwara
fujiwara at fedoraproject.org
Tue Jun 11 07:50:18 UTC 2013
commit 19ed92eb8ed2f46944109ea5e13cb7a470a7ee08
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Tue Jun 11 16:36:28 2013 +0900
Removed dependencies of ibus-setup and ibus-pygtk2
ibus.spec | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/ibus.spec b/ibus.spec
index 750c779..c506455 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -41,7 +41,7 @@
Name: ibus
Version: 1.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -113,10 +113,6 @@ BuildRequires: gnome-shell
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-gtk2 = %{version}-%{release}
Requires: %{name}-gtk3 = %{version}-%{release}
-%if %with_python_pkg
-Requires: %{name}-setup = %{version}-%{release}
-Requires: %{name}-pygtk2 = %{version}-%{release}
-%endif
Requires: iso-codes
Requires: dbus-python >= %{dbus_python_version}
@@ -203,6 +199,7 @@ This package contains ibus im module for gtk3
Summary: IBus setup utility
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-panel = %{version}-%{release}
Requires: pygobject3
BuildRequires: gobject-introspection-devel
BuildRequires: pygobject3-devel
@@ -222,9 +219,18 @@ Requires: pyxdg
BuildArch: noarch
%description pygtk2
-This is a pygtk2 library for IBus. Now major IBUs engines use pygobject3
+This is a pygtk2 library for IBus. Now major IBus engines use pygobject3
and this package will be deprecated.
%endif
+
+%package panel
+Summary: IBus panel icon
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-setup = %{version}-%{release}
+
+%description panel
+This is a GTK+ status icon on panel for IBus.
%endif
%if %with_gjs
@@ -448,7 +454,8 @@ fi
%{_datadir}/bash-completion/completions/ibus.bash
%{_datadir}/GConf/gsettings/*
%{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/ibus/component
+%{_datadir}/ibus/component/*conf.xml
+%{_datadir}/ibus/component/simple.xml
%{_datadir}/ibus/engine
%{_datadir}/ibus/keymaps
%{_datadir}/icons/hicolor/*/apps/*
@@ -456,7 +463,6 @@ fi
%{_datadir}/man/man1/ibus-daemon.1.gz
%{_libexecdir}/ibus-engine-simple
%{_libexecdir}/ibus-dconf
-%{_libexecdir}/ibus-ui-gtk3
%{_libexecdir}/ibus-x11
# {_sysconfdir}/xdg/autostart/ibus.desktop
%{_sysconfdir}/dconf/db/ibus.d
@@ -473,6 +479,8 @@ fi
%dir %{python2_sitelib}/ibus
%{python2_sitelib}/ibus/*
%endif
+%{_datadir}/ibus/component/gtkpanel.xml
+%{_libexecdir}/ibus-ui-gtk3
%endif
%files libs
@@ -498,6 +506,10 @@ fi
%dir %{python2_sitelib}/ibus
%{python2_sitelib}/ibus/*
%endif
+
+%files panel
+%{_datadir}/ibus/component/gtkpanel.xml
+%{_libexecdir}/ibus-ui-gtk3
%endif
%if %with_gjs
@@ -518,6 +530,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jun 11 2013 Takao Fujiwara <tfujiwar at redhat.com> - 1.5.2-5
+- Removed dependencies of ibus-setup and ibus-pygtk2
+
* Wed Jun 05 2013 Takao Fujiwara <tfujiwar at redhat.com> - 1.5.2-4
- Updated ibus-HEAD.patch for upstream.
- Added ibus-xx-1.5.2.patch until 1.5.3 will be released.
More information about the scm-commits
mailing list