Author: phuang
Update of /cvs/pkgs/rpms/ibus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31588
Modified Files:
.cvsignore ibus.spec sources
Log Message:
back port from devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 5 Oct 2008 11:36:00 -0000 1.14
+++ .cvsignore 1 Nov 2008 01:45:03 -0000 1.15
@@ -1 +1 @@
-ibus-0.1.1.20081005.tar.gz
+ibus-0.1.1.20081023.tar.gz
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/ibus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ibus.spec 5 Oct 2008 11:36:00 -0000 1.16
+++ ibus.spec 1 Nov 2008 01:45:03 -0000 1.17
@@ -2,7 +2,7 @@
%{!?gtk_binary_version: %define gtk_binary_version %(pkg-config
--variable=gtk_binary_version gtk+-2.0)}
%define mod_path ibus-0.1
Name: ibus
-Version: 0.1.1.20081005
+Version: 0.1.1.20081023
Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
@@ -19,10 +19,19 @@
BuildRequires: gtk2-devel
BuildRequires: qt-devel
BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
+
+Requires(post): desktop-file-utils
+Requires(post): %{_sbindir}/alternatives
+Requires(postun): desktop-file-utils
+Requires(postun): %{_sbindir}/alternatives
Requires: pygtk2
Requires: dbus-python >= 0.83.0
Requires: gnome-python2-gconf
+Requires: notification-daemon
+Requires: imsettings
+Requires: im-chooser
Requires: pyxdg
Requires: iso-codes
@@ -32,7 +41,7 @@
developers to develop input method easily.
%package gtk
-Summary: iBus im module for gtk2
+Summary: IBus im module for gtk2
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
@@ -40,10 +49,10 @@
This package contains ibus im module for gtk2
%package qt
-Summary: iBus im module for qt4
+Summary: IBus im module for qt4
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: qt >= 4.4.1
+Requires: qt >= 4.4.2
%description qt
This package contains ibus im module for qt4
@@ -69,21 +78,38 @@
mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
+# install .desktop files
+echo "NoDisplay=true" >>
$RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
+echo "NoDisplay=true" >>
$RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/*
+
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+update-desktop-database -q
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc
%{_xinputconf} 83 || :
%post gtk
%{_bindir}/update-gtk-immodules %{_host} || :
+%postun
+/sbin/ldconfig
+update-desktop-database -q
+if [ "$1" = "0" ]; then
+ %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
+ # if alternative was set to manual, reset to auto
+ [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink
%{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] &&
%{_sbindir}/alternatives --auto xinputrc || :
+fi
+
%postun gtk
%{_bindir}/update-gtk-immodules %{_host} || :
-%postun -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
@@ -92,7 +118,7 @@
%dir %{_datadir}/ibus/
%dir %{_datadir}/ibus/daemon/
%dir %{_datadir}/ibus/gconf/
-%dir %{_datadir}/ibus/panel/
+%dir %{_datadir}/ibus/ui/
%dir %{_datadir}/ibus/setup/
%dir %{_datadir}/ibus/engine/
%dir %{_datadir}/ibus/icons/
@@ -101,28 +127,41 @@
%{_libdir}/libibus-gtk.so*
%{_datadir}/ibus/daemon/*
%{_datadir}/ibus/gconf/*
-%{_datadir}/ibus/panel/*
+%{_datadir}/ibus/ui/*
%{_datadir}/ibus/setup/*
%{_datadir}/ibus/icons/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_bindir}/ibus-daemon
%{_bindir}/ibus-gconf
-%{_bindir}/ibus-panel
+%{_bindir}/ibus-ui-gtk
%{_bindir}/ibus-x11
%config %{_xinputconf}
%files gtk
%defattr(-,root,root,-)
-%doc
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
%files qt
%defattr(-,root,root,-)
-%doc
%{_libdir}/qt4/plugins/inputmethods/libibus.so
%changelog
+* Thu Oct 23 2008 Huang Peng <shawn.p.huang(a)gmail.com> - 0.1.1.20081023-1
+- Update to 0.1.1.20081023.
+
+* Thu Oct 16 2008 Huang Peng <shawn.p.huang(a)gmail.com> - 0.1.1.20081016-1
+- Update to 0.1.1.20081016.
+
+* Tue Oct 7 2008 Jens Petersen <petersen(a)redhat.com> - 0.1.1.20081006-3
+- remove the empty %%doc file entries
+
+* Tue Oct 7 2008 Jens Petersen <petersen(a)redhat.com> - 0.1.1.20081006-2
+- add xinputrc alternative when installing or uninstalling
+
+* Mon Oct 06 2008 Huang Peng <shawn.p.huang(a)gmail.com> - 0.1.1.20081006-1
+- Update to 0.1.1.20081006.
+
* Sun Oct 05 2008 Huang Peng <shawn.p.huang(a)gmail.com> - 0.1.1.20081005-1
- Update to 0.1.1.20081005.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 5 Oct 2008 11:36:00 -0000 1.17
+++ sources 1 Nov 2008 01:45:03 -0000 1.18
@@ -1 +1 @@
-0532377e774686e5e165d6e58243f6a2 ibus-0.1.1.20081005.tar.gz
+66f52391db31d59ba1c236322b84d834 ibus-0.1.1.20081023.tar.gz
Show replies by date