|
|
@@ -1,12 +1,12 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
-%define ver 1.4.99.20121006
|
|
|
-%define rel 2
|
|
|
+%define ver 1.5.1
|
|
|
+%define rel 1
|
|
|
|
|
|
-%define gjsver 3.4.1.20120815
|
|
|
+%define gjsver 3.4.1.20130115
|
|
|
|
|
|
%if "%{?_dist_release}" >= "vl7"
|
|
|
-%define have_gjsfile 1
|
|
|
+%define have_gjsfile 0
|
|
|
%define have_libxkbfile 1
|
|
|
%else
|
|
|
%define have_gjsfile 0
|
|
|
@@ -32,17 +32,21 @@ Patch2: ibus-541492-xkb.patch
|
|
|
Patch3: ibus-530711-preload-sys.patch
|
|
|
Patch4: ibus-xx-setup-frequent-lang.patch
|
|
|
|
|
|
-Patch6: ibus-xx-no-use.diff
|
|
|
+Patch94: %{name}-xx-vapi-build-failure.patch
|
|
|
|
|
|
# add Shift+space as trigger key instead of Ctrl+space
|
|
|
-Patch20: ibus-1.3.9-vine.patch
|
|
|
+Patch200: ibus-1.3.9-vine.patch
|
|
|
|
|
|
Requires: gtk2, pyxdg, iso-codes, dbus-python >= 0.83.0
|
|
|
Requires: notify-python
|
|
|
Requires: librsvg2
|
|
|
+
|
|
|
Requires(post): glib2
|
|
|
Requires(post,postun): coreutils, gtk2
|
|
|
Requires(postun,posttrans): glib2
|
|
|
+
|
|
|
+Obsoletes: ibus-gnome3 < %{version}-%{release}
|
|
|
+
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: gettext >= 0.16.1, gtk2-devel, intltool >= 0.40.0
|
|
|
BuildRequires: dbus-devel, dbus-python-devel >= 0.83.0
|
|
|
@@ -50,6 +54,7 @@ BuildRequires: glib2-devel >= 2.0.0
|
|
|
BuildRequires: iso-codes
|
|
|
BuildRequires: gtk3-devel >= 3.0.0
|
|
|
BuildRequires: vala
|
|
|
+BuildRequires: vala-devel
|
|
|
BuildRequires: vala-tools
|
|
|
%if %have_gjsfile
|
|
|
BuildRequires: gjs
|
|
|
@@ -57,7 +62,6 @@ BuildRequires: gnome-shell
|
|
|
%endif
|
|
|
%if %have_libxkbfile
|
|
|
BuildRequires: libxkbfile-devel
|
|
|
-BuildRequires: libgnomekbd-devel
|
|
|
%endif
|
|
|
BuildRequires: GConf2-devel
|
|
|
BuildRequires: dconf-devel
|
|
|
@@ -149,29 +153,26 @@ rm -f data/dconf/00-upstream-settings
|
|
|
%patch3 -p1 -b .preload-sys
|
|
|
%patch4 -p1 -b .setup-frequent-lang
|
|
|
|
|
|
-%patch6 -p1 -b .no-used
|
|
|
+%patch94 -p1 -b .vapi
|
|
|
|
|
|
-%patch20 -p1 -b .vine
|
|
|
+%patch200 -p1 -b .vine
|
|
|
|
|
|
%if %have_libxkbfile
|
|
|
autoreconf -if
|
|
|
%endif
|
|
|
%configure \
|
|
|
--disable-static \
|
|
|
+ --enable-vala=yes \
|
|
|
--enable-gtk3 \
|
|
|
--enable-gtk2 \
|
|
|
--with-gtk2-im-module-dir=%{_libdir}/gtk-2.0/immodules \
|
|
|
--enable-xim \
|
|
|
--disable-gtk-doc \
|
|
|
- --with-no-snooper-apps='gnome-do,Do.*,firefox.*,:*chrome.*,.*chromium.*' \
|
|
|
+ --with-no-snooper-apps='gnome-do,Do.*,firefox.*,.*chrome.*,.*chromium.*' \
|
|
|
--enable-surrounding-text \
|
|
|
--enable-python-library \
|
|
|
--enable-dconf \
|
|
|
--disable-gconf \
|
|
|
-%if %have_libxkbfile
|
|
|
- --enable-xkb \
|
|
|
- --enable-libgnomekbd \
|
|
|
-%endif
|
|
|
--enable-introspection
|
|
|
|
|
|
|
|
|
@@ -187,7 +188,9 @@ make %{?_smp_mflags}
|
|
|
d=`basename %SOURCE1 .tar.gz`
|
|
|
cd $d
|
|
|
export PKG_CONFIG_PATH=..:/usr/lib64/pkgconfig:/usr/lib/pkgconfig
|
|
|
-%configure --with-gjs-version="1.34"
|
|
|
+%configure \
|
|
|
+ --with-gnome-shell-version="3.5.3,3.4,3.3.92,3.3.90,3.3.5,3.3.4,3.3.3,3.2" \
|
|
|
+ --with-gjs-version="1.33.3,1.32,1.31.22,1.31.20,1.31.10,1.31.6,1.31.11,1.30"
|
|
|
make %{?_smp_mflags}
|
|
|
cd ..
|
|
|
%endif
|
|
|
@@ -304,9 +307,6 @@ dconf update
|
|
|
%{_sysconfdir}/bash_completion.d/ibus.bash
|
|
|
%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
|
|
|
%{_sysconfdir}/dconf/profile/ibus
|
|
|
-%if %have_libxkbfile
|
|
|
-%{_libexecdir}/ibus-xkb
|
|
|
-%endif
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
@@ -343,6 +343,11 @@ dconf update
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Mar 23 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.5.1-1
|
|
|
+- update to 1.5.1
|
|
|
+- disable ibus-gjs build
|
|
|
+- obsoletes ibus-gnome3
|
|
|
+
|
|
|
* Wed Oct 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.99.20121006-2
|
|
|
- update Patch2 (ibus-541492-xkb.patch)
|
|
|
- add Patch0 (ibus-HEAD.patch) from fedora
|
daisuke