|
|
@@ -1,5 +1,5 @@
|
|
|
%define ver 1.3.4
|
|
|
-%define rel 1
|
|
|
+%define rel 2
|
|
|
|
|
|
Summary: Intelligent Input Bus for Linux / Unix OS
|
|
|
Name: ibus
|
|
|
@@ -12,6 +12,14 @@ Source0: %{name}-%{version}.tar.gz
|
|
|
#Source1: ibus-1.1.0.20090407-ja.po
|
|
|
Patch0: ibus-1.2.0.20091024-fixPOFILES.in.patch
|
|
|
Requires: gtk2, pyxdg, iso-codes, dbus-python >= 0.83.0
|
|
|
+Requires: notify-python
|
|
|
+Requires: librsvg2
|
|
|
+Requires(pre): GConf2
|
|
|
+Requires(post): GConf2
|
|
|
+Requires(preun): GConf2
|
|
|
+Requires(post): glib2
|
|
|
+Requires(post,postun): coreutils, gtk2
|
|
|
+BuildRequires(install,check): desktop-file-utils
|
|
|
BuildRequires: gettext >= 0.16.1, gtk2-devel, intltool >= 0.40.0
|
|
|
BuildRequires: dbus-devel, dbus-python-devel >= 0.83.0
|
|
|
BuildRequires: glib2-devel >= 2.0.0
|
|
|
@@ -34,6 +42,8 @@ It also may help developers to develop input method easily.
|
|
|
Summary: Header files for iBus
|
|
|
Group: Development/Libraries
|
|
|
Requires: ibus == %{version}-%{release}
|
|
|
+Requires: glib2-devel
|
|
|
+Requires: dbus-devel
|
|
|
|
|
|
%description devel
|
|
|
Header files for iBus.
|
|
|
@@ -53,6 +63,8 @@ make DESTDIR=%{buildroot} install
|
|
|
rm -rf %{buildroot}%{_libdir}/libibus.la
|
|
|
rm -rf %{buildroot}%{_libdir}/gtk-2.0/immodules/im-ibus.la
|
|
|
|
|
|
+rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/ibus.desktop
|
|
|
+
|
|
|
%find_lang %{name}
|
|
|
|
|
|
%clean
|
|
|
@@ -60,14 +72,48 @@ rm -rf %{buildroot}
|
|
|
|
|
|
%check
|
|
|
#make check
|
|
|
+%{_bindir}/desktop-file-validate %{buildroot}/%{_datadir}/applications/ibus.desktop
|
|
|
+%{_bindir}/desktop-file-validate %{buildroot}/%{_datadir}/applications/ibus-setup.desktop
|
|
|
+
|
|
|
|
|
|
%post
|
|
|
/sbin/ldconfig
|
|
|
+if [ -x %{_bindir}/update-desktop-database ] ; then
|
|
|
+%{_bindir}/update-desktop-database %{_datadir}/applications
|
|
|
+fi
|
|
|
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
|
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
|
|
|
+# recreate icon cache
|
|
|
+touch --no-create %{_datadir}/icons/hicolor || :
|
|
|
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
|
|
|
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
|
|
+
|
|
|
+
|
|
|
+%pre
|
|
|
+if [ "$1" -gt 1 ]; then
|
|
|
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
|
|
|
+fi
|
|
|
+
|
|
|
+
|
|
|
+%preun
|
|
|
+if [ "$1" -eq 0 ]; then
|
|
|
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/ibus.schemas >& /dev/null || :
|
|
|
+fi
|
|
|
+
|
|
|
|
|
|
%postun
|
|
|
/sbin/ldconfig
|
|
|
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
|
+if [ -x %{_bindir}/update-desktop-database ] ; then
|
|
|
+%{_bindir}/update-desktop-database %{_datadir}/applications
|
|
|
+fi
|
|
|
+# recreate icon cache
|
|
|
+touch --no-create %{_datadir}/icons/hicolor || :
|
|
|
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
|
|
|
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
|
|
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
@@ -85,7 +131,7 @@ rm -rf %{buildroot}
|
|
|
%{_datadir}/ibus
|
|
|
%{_datadir}/gtk-doc/html/ibus
|
|
|
%{_datadir}/icons/hicolor/*/apps/*
|
|
|
-%{_sysconfdir}/xdg/autostart/ibus.desktop
|
|
|
+#%{_sysconfdir}/xdg/autostart/ibus.desktop
|
|
|
%{_sysconfdir}/gconf/schemas/ibus.schemas
|
|
|
|
|
|
%files devel
|
|
|
@@ -95,6 +141,16 @@ rm -rf %{buildroot}
|
|
|
%{_includedir}/ibus-1.0
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 9 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.4-2
|
|
|
+- update Requires: notify-python librsvg2
|
|
|
+- execute gconftool-2 on {post,pre,preun}
|
|
|
+- add Requires: Gconf2 on {post,pre,preun}
|
|
|
+- update Requires: glib2-devel dbus-devel for ibus-devel package
|
|
|
+- execute update-desktop-database on {post,postun}
|
|
|
+- execute gtk-update-icon-cache on {post,postun}: <BTS:VineLinux:955>
|
|
|
+- add Requires: coreutils, gtk2 on {post,postun}
|
|
|
+- drop %%{_sysconfdir}/xdg/autostart/ibus.desktop file
|
|
|
+
|
|
|
* Sun Jun 6 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.4-1
|
|
|
- new upstream release
|
|
|
- stop 'make check'
|
iwaim