|
|
@@ -12,7 +12,7 @@
|
|
|
%define qt3_ver 3.3.8
|
|
|
%define qt4_ver 4.7.2
|
|
|
# Qt3 version auto-detection -- inagaki
|
|
|
-%define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel 2>/dev/null || echo %{qt3_ver})
|
|
|
+%define _qt3_version %(pkg-config --modversion --silence-errors qt-mt 2>/dev/null || echo %{qt3_ver})
|
|
|
%define _qt3_prefix %{_libdir}/qt-%{_qt3_version}
|
|
|
%define _qt3_plugindir %{_qt3_prefix}/plugins
|
|
|
|
|
|
@@ -28,8 +28,8 @@
|
|
|
Name: uim
|
|
|
Summary: Uim an input method library
|
|
|
Summary(ja): 入力メソッドライブラリ
|
|
|
-Version: 1.6.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 1.7.1
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
License: LGPLv2/BSD
|
|
|
Group: System Environment/Libraries
|
|
|
@@ -113,6 +113,25 @@ input pad, candidate window, and preference tool using GTK.
|
|
|
このパッケージには、GTK を使ったツールバーやシステムトレイ、入力パッド、
|
|
|
候補ウィンドウ、設定ツールなどが含まれています。
|
|
|
|
|
|
+%package gtk3
|
|
|
+Summary: GTK3 helper for uim
|
|
|
+Summary(ja): uim の GTK3 ヘルパー
|
|
|
+Group: User Interface/Desktops
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: gtk3
|
|
|
+Requires(post): gtk3
|
|
|
+Requires(post): %{name} = %{version}-%{release}
|
|
|
+Requires(postun): gtk3
|
|
|
+
|
|
|
+%description gtk3
|
|
|
+This package contains some applications like toolbar, system tray,
|
|
|
+input pad, candidate window, and preference tool using GTK3.
|
|
|
+
|
|
|
+%description -l ja gtk3
|
|
|
+このパッケージには、GTK3 を使ったツールバーやシステムトレイ、入力パッド、
|
|
|
+候補ウィンドウ、設定ツールなどが含まれています。
|
|
|
+
|
|
|
+
|
|
|
%if %{with_qt}
|
|
|
%package qt
|
|
|
Summary: Qt3 support for Uim
|
|
|
@@ -159,10 +178,10 @@ and preference tool using Qt4.
|
|
|
Summary: GNOME panel applet for Uim
|
|
|
Summary(ja): uim の GNOME 用パネルアプレット
|
|
|
Group: User Interface/Desktops
|
|
|
-BuildRequires: libgnomeui-devel
|
|
|
+#BuildRequires: libgnomeui-devel
|
|
|
Requires: %{name}-xim = %{version}-%{release}
|
|
|
-Requires: %{name}-gtk = %{version}-%{release}
|
|
|
-Requires: libgnomeui
|
|
|
+Requires: %{name}-gtk3 = %{version}-%{release}
|
|
|
+#Requires: libgnomeui
|
|
|
|
|
|
%description applet
|
|
|
uim-applet is GNOME panel applet for uim.
|
|
|
@@ -355,6 +374,7 @@ export QTDIR=%{_qt3_prefix}
|
|
|
--with-anthy --with-anthy-utf8 \
|
|
|
--without-scim --without-prime \
|
|
|
--with-gtk2 \
|
|
|
+ --with-gtk3 \
|
|
|
--with-m17nlib \
|
|
|
--with-curl \
|
|
|
--with-expat \
|
|
|
@@ -362,7 +382,7 @@ export QTDIR=%{_qt3_prefix}
|
|
|
--with-eb --with-eb-conf=%{_sysconfdir}/eb.conf \
|
|
|
--disable-static \
|
|
|
%if %{with_gnome}
|
|
|
- --enable-gnome-applet \
|
|
|
+ --enable-gnome3-applet \
|
|
|
%else
|
|
|
--disable-gnome-applet \
|
|
|
%endif
|
|
|
@@ -437,6 +457,7 @@ make install DESTDIR=%{buildroot}
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/prime.scm
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/prime-*.scm
|
|
|
%__rm -f %{buildroot}%{_libdir}/gtk-2.0/*/immodules/*.{a,la}
|
|
|
+%__rm -f %{buildroot}%{_libdir}/gtk-3.0/*/immodules/*.{a,la}
|
|
|
%__rm -f %{buildroot}%{_libdir}/uim/plugin/*.{a,la}
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/pixmaps/scim.*
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/pixmaps/prime*.*
|
|
|
@@ -510,6 +531,14 @@ if [ $1 = 0 ] ; then
|
|
|
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules ||:
|
|
|
fi
|
|
|
|
|
|
+%post gtk3
|
|
|
+%{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
|
|
|
+
|
|
|
+%postun gtk3
|
|
|
+if [ $1 = 0 ] ; then
|
|
|
+ %{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
|
|
|
+fi
|
|
|
+
|
|
|
%post anthy
|
|
|
%{_datadir}/uim/update-installed-modules.sh --register anthy > /dev/null 2>&1
|
|
|
|
|
|
@@ -619,13 +648,27 @@ fi
|
|
|
|
|
|
%files gtk
|
|
|
%defattr(-,root,root)
|
|
|
-%{_bindir}/uim-*-gtk*
|
|
|
+%{_bindir}/uim-im-switcher-gtk
|
|
|
%{_bindir}/uim-input-pad-ja
|
|
|
+%{_bindir}/uim-pref-gtk
|
|
|
+%{_bindir}/uim-toolbar-gtk
|
|
|
+%{_bindir}/uim-toolbar-gtk-systray
|
|
|
%{_libexecdir}/uim-candwin-gtk
|
|
|
%{_libexecdir}/uim-candwin-tbl-gtk
|
|
|
%{_libdir}/gtk-2.0/*/immodules/*.so
|
|
|
%{_datadir}/applications/uim.desktop
|
|
|
|
|
|
+%files gtk3
|
|
|
+%defattr(-,root,root)
|
|
|
+%{_bindir}/uim-im-switcher-gtk3
|
|
|
+%{_bindir}/uim-input-pad-ja-gtk3
|
|
|
+%{_bindir}/uim-pref-gtk3
|
|
|
+%{_bindir}/uim-toolbar-gtk3
|
|
|
+%{_bindir}/uim-toolbar-gtk3-systray
|
|
|
+%{_libexecdir}/uim-candwin-gtk3
|
|
|
+%{_libexecdir}/uim-candwin-tbl-gtk3
|
|
|
+%{_libdir}/gtk-3.0/*/immodules/*.so
|
|
|
+
|
|
|
%if %{with_qt}
|
|
|
%files qt
|
|
|
%defattr(-,root,root)
|
|
|
@@ -661,8 +704,9 @@ fi
|
|
|
%if %{with_gnome}
|
|
|
%files applet
|
|
|
%defattr(-,root,root)
|
|
|
-%{_libdir}/bonobo/servers/*
|
|
|
-%{_libexecdir}/uim-toolbar-applet
|
|
|
+%{_libexecdir}/uim-toolbar-applet-gnome3
|
|
|
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.UimAppletFactory.service
|
|
|
+%{_datadir}/gnome-panel/4.0/applets/UimApplet.panel-applet
|
|
|
%endif
|
|
|
|
|
|
%if %{with_kde}
|
|
|
@@ -750,6 +794,10 @@ fi
|
|
|
%{_libdir}/pkgconfig/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Aug 21 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7.1-1
|
|
|
+- new upstream release
|
|
|
+- built with gtk3 and GNOME3
|
|
|
+
|
|
|
* Tue Mar 8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.1-2
|
|
|
- rebuilt with qt4-4.7.2
|
|
|
|
inagaki