diff --git a/.abf.yml b/.abf.yml index 8aecc71..f7f7bb8 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "ibus-1.3.9.tar.gz": 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 + "ibus-1.4.99.20120917.tar.gz": 8f87c26f511aff82122ba01fe8f459d088453816 diff --git a/ibus.spec b/ibus.spec index faf840f..01780c7 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,5 +1,5 @@ -%define version 1.3.9 -%define release %mkrel 8 +%define version 1.4.99.20120917 +%define release %mkrel 1 Name: ibus Summary: A next generation input framework @@ -11,7 +11,6 @@ URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Source1: ibus.macros Patch0: ibus-1.3.6-mdv-customize.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %py_requires -d BuildRequires: gtk2-devel BuildRequires: gtk+3-devel @@ -35,7 +34,7 @@ Suggests: %{name}-gtk = %version %description IBus is a next generation input framework. -%define major 2 +%define major 5 %define libname %mklibname %name %major %package -n %libname @@ -77,7 +76,8 @@ IBus gtk module. %build %configure2_5x \ --enable-gtk3 \ - --disable-dbus-python-check + --disable-dbus-python-check \ + --enable-python-library %make %install @@ -96,22 +96,21 @@ rm -f %buildroot%_libdir/*.la rm -f %buildroot%_libdir/gtk-*/*/immodules/*.la rm -f %buildroot%{_sysconfdir}/xdg/autostart/ibus.desktop -%find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT +%find_lang %{name}10 %preun %preun_uninstall_gconf_schemas ibus -%files -f %name.lang +%files -f %{name}10.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README +%{_sysconfdir}/bash_completion.d/ibus.bash %{_sysconfdir}/gconf/schemas/ibus.schemas %{_bindir}/* %{_libexecdir}/ibus-gconf %{_libexecdir}/ibus-x11 -%{_libexecdir}/ibus-ui-gtk +%{_libexecdir}/ibus-ui-gtk* +%{_libexecdir}/ibus-engine-simple %{_datadir}/applications/*.desktop %{_datadir}/ibus/* %{_iconsdir}/*/*/*/* @@ -119,8 +118,7 @@ rm -rf $RPM_BUILD_ROOT %files -n %{libname} %defattr(-,root,root) -%{_libdir}/libibus.so.%{major} -%{_libdir}/libibus.so.%{major}.* +%{_libdir}/libibus*.so.* %{_libdir}/girepository-1.0/*.typelib %files gtk @@ -139,10 +137,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/ibus %{_datadir}/gir-1.0/*.gir %{_datadir}/vala/vapi/*.vapi +%{_datadir}/vala/vapi/ibus-1.0.deps %{_sysconfdir}/rpm/macros.d/%name.macros %changelog +* Wed Oct 3 2012 Arkady L. Shane 1.4.99.20120917-1 +- update to 1.4.99.20120917 + * Fri May 06 2011 Funda Wang 1.3.9-6mdv2011.0 + Revision: 669810 - fix escape char of macros