Update to ibus-1.1.0.20090225

This commit is contained in:
Peng Huang 2009-02-25 05:59:33 +00:00
parent f1f13f7bda
commit 17114051e0
4 changed files with 24 additions and 1994 deletions

View File

@ -1 +1 @@
ibus-1.1.0.20090211.tar.gz ibus-1.1.0.20090225.tar.gz

File diff suppressed because it is too large Load Diff

View File

@ -2,8 +2,8 @@
%{!?gtk_binary_version: %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)} %{!?gtk_binary_version: %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)}
%define mod_path ibus-1.1 %define mod_path ibus-1.1
Name: ibus Name: ibus
Version: 1.1.0.20090211 Version: 1.1.0.20090225
Release: 10%{?dist} Release: 1%{?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
@ -95,7 +95,7 @@ docs for ibus.
%prep %prep
%setup -q %setup -q
%patch0 -p1 # %patch0 -p1
%build %build
%configure --disable-static \ %configure --disable-static \
@ -116,6 +116,10 @@ mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf} install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_xinputconf}
# install .desktop files # install .desktop files
echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus.desktop
echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup.desktop
echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop
desktop-file-install --delete-original \ desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/* $RPM_BUILD_ROOT%{_datadir}/applications/*
@ -125,16 +129,17 @@ desktop-file-install --delete-original \
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post libs %post
/sbin/ldconfig
update-desktop-database -q update-desktop-database -q
%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || : %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
%post libs
/sbin/ldconfig
%post gtk %post gtk
%{_bindir}/update-gtk-immodules %{_host} || : %{_bindir}/update-gtk-immodules %{_host} || :
%postun libs %postun
/sbin/ldconfig
update-desktop-database -q update-desktop-database -q
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
%{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || : %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
@ -142,6 +147,9 @@ if [ "$1" = "0" ]; then
[ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
fi fi
%postun libs
/sbin/ldconfig
%postun gtk %postun gtk
%{_bindir}/update-gtk-immodules %{_host} || : %{_bindir}/update-gtk-immodules %{_host} || :
@ -159,6 +167,7 @@ fi
%{_libexecdir}/ibus-gconf %{_libexecdir}/ibus-gconf
%{_libexecdir}/ibus-ui-gtk %{_libexecdir}/ibus-ui-gtk
%{_libexecdir}/ibus-x11 %{_libexecdir}/ibus-x11
# %{_sysconfdir}/xdg/autostart/ibus.desktop
%config %{_xinputconf} %config %{_xinputconf}
%files libs %files libs
@ -181,6 +190,11 @@ fi
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%changelog %changelog
* Tue Feb 25 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090225-1
- Update to ibus-1.1.0.20090225.
- Fix problems in %post and %postun scripts.
- Hide ibus & ibus preferences menu items.
* Tue Feb 17 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090211-10 * Tue Feb 17 2009 Huang Peng <shawn.p.huang@gmail.com> - 1.1.0.20090211-10
- Recreate the ibus-HEAD.patch from upstream git source tree. - Recreate the ibus-HEAD.patch from upstream git source tree.
- Put 'Select an input method' in engine select combobox (#485861). - Put 'Select an input method' in engine select combobox (#485861).

View File

@ -1 +1 @@
dc0471614f08dcfa3356659dcf4caabb ibus-1.1.0.20090211.tar.gz 7598bf629166770e49f89df383923726 ibus-1.1.0.20090225.tar.gz