rpms/ibus/devel ibus.spec,1.37,1.38 xinput-ibus,1.4,1.5
Huang Peng
phuang at fedoraproject.org
Wed Feb 11 03:26:34 UTC 2009
- Previous message (by thread): rpms/perl-Data-Visitor/devel .cvsignore, 1.4, 1.5 perl-Data-Visitor.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Data-Visitor/F-10 perl-Data-Visitor.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: phuang
Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31431
Modified Files:
ibus.spec xinput-ibus
Log Message:
- Add --xim argument in xinput-ibus
- Add Obsoletes: ibus-qt <= 1.1.0
- Move libibus.so.* to ibus-libs to make ibus multilib.
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ibus.spec 5 Feb 2009 04:51:29 -0000 1.37
+++ ibus.spec 11 Feb 2009 03:26:04 -0000 1.38
@@ -3,7 +3,7 @@
%define mod_path ibus-1.1
Name: ibus
Version: 1.1.0.20090205
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -27,6 +27,8 @@
BuildRequires: GConf2-devel
BuildRequires: pygobject2-devel
+Requires: %{name}-libs = %{version}-%{release}
+
Requires(post): desktop-file-utils
Requires(post): %{_sbindir}/alternatives
Requires(postun): desktop-file-utils
@@ -40,7 +42,12 @@
Requires: pyxdg
Requires: iso-codes
-Obsoletes: ibus-anthy <= 1.1.0, ibus-pinyin <= 1.1.0, ibus-m17n <= 1.1.0, ibus-hangul <= 1.1.0, ibus-chewing <= 1.1.0
+Obsoletes: ibus-qt <= 1.1.0
+Obsoletes: ibus-anthy <= 1.1.0
+Obsoletes: ibus-pinyin <= 1.1.0
+Obsoletes: ibus-m17n <= 1.1.0
+Obsoletes: ibus-hangul <= 1.1.0
+Obsoletes: ibus-chewing <= 1.1.0
%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
@@ -49,6 +56,13 @@
full featured and user friendly input method user interface. It also may help
developers to develop input method easily.
+%package libs
+Summary: IBus libraries
+Group: System Environment/Libraries
+
+%description libs
+This package contains the libraries for IBus
+
%package gtk
Summary: IBus im module for gtk2
Group: System Environment/Libraries
@@ -109,7 +123,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post libs
/sbin/ldconfig
update-desktop-database -q
%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
@@ -117,7 +131,7 @@
%post gtk
%{_bindir}/update-gtk-immodules %{_host} || :
-%postun
+%postun libs
/sbin/ldconfig
update-desktop-database -q
if [ "$1" = "0" ]; then
@@ -137,7 +151,6 @@
%dir %{_datadir}/ibus/
%{_bindir}/ibus-daemon
%{_bindir}/ibus-setup
-%{_libdir}/libibus.so*
%{_datadir}/ibus/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
@@ -146,6 +159,10 @@
%{_libexecdir}/ibus-x11
%config %{_xinputconf}
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libibus.so*
+
%files gtk
%defattr(-,root,root,-)
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
@@ -162,6 +179,11 @@
%{_libdir}/pkgconfig/*
%changelog
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-2
+- Add --xim argument in xinput-ibus
+- Add Obsoletes: ibus-qt <= 1.1.0
+- Move libibus.so.* to ibus-libs to make ibus multilib.
+
* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
- Update to 1.1.0.20090205.
Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/xinput-ibus,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xinput-ibus 5 Feb 2009 04:51:29 -0000 1.4
+++ xinput-ibus 11 Feb 2009 03:26:04 -0000 1.5
@@ -1,7 +1,7 @@
XIM=ibus
XIM_PROGRAM="/usr/bin/ibus-daemon"
ICON="/usr/share/ibus/icons/ibus.svg"
-# XIM_ARGS="0xffffffff"
+XIM_ARGS="--xim"
PREFERENCE_PROGRAM=/usr/bin/ibus-setup
SHORT_DESC="IBus"
GTK_IM_MODULE=ibus
- Previous message (by thread): rpms/perl-Data-Visitor/devel .cvsignore, 1.4, 1.5 perl-Data-Visitor.spec, 1.5, 1.6 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Data-Visitor/F-10 perl-Data-Visitor.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list