|
|
@@ -9,36 +9,71 @@
|
|
|
#define with_canna %{?_without_canna:0}%{!?_without_canna:1}
|
|
|
%define with_canna 0
|
|
|
|
|
|
-%define qtver 3.3.8
|
|
|
-%define qtdir %{_libdir}/qt-%{qtver}
|
|
|
+%define qt3_ver 3.3.8
|
|
|
+%define qt4_ver 4.6.1
|
|
|
+# Qt3 version auto-detection -- inagaki
|
|
|
+%define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel 2>/dev/null || echo %{qt3_ver})
|
|
|
+%define _qt3_prefix %{_libdir}/qt-%{_qt3_version}
|
|
|
+%define _qt3_plugindir %{_qt3_prefix}/plugins
|
|
|
+
|
|
|
+# build qt4 immodule ("--without qt4" to disable qt4)
|
|
|
+%bcond_without qt4
|
|
|
+# Qt4 version auto-detection -- inagaki
|
|
|
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
|
|
|
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
|
+%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
|
|
|
|
|
|
#%%define extraver beta
|
|
|
|
|
|
+Name: uim
|
|
|
Summary: Uim an input method library
|
|
|
Summary(ja): uim - 入力メソッドライブラリ
|
|
|
-Name: uim
|
|
|
-Version: 1.5.6
|
|
|
-Release: 5%{?_dist_release}
|
|
|
+Version: 1.5.7
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+
|
|
|
+License: LGPLv2/BSD
|
|
|
+Group: System Environment/Libraries
|
|
|
URL: http://code.google.com/p/uim/
|
|
|
+
|
|
|
Source0: http://uim.googlecode.com/files/uim-%{version}%{?extraver:-%extraver}.tar.bz2
|
|
|
Source1: uim-el-install.sh
|
|
|
Source2: uim-el-remove.sh
|
|
|
Source3: uim-update-installed-modules.sh.in
|
|
|
-License: LGPLv2/BSD
|
|
|
-Group: System Environment/Libraries
|
|
|
+# Bug 24728
|
|
|
+Patch0: uim-1.5.7-qt4.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: libXft-devel libX11-devel libXext-devel
|
|
|
BuildRequires: libXrender-devel libXau-devel libXdmcp-devel libXt-devel
|
|
|
-BuildRequires: gtk2-devel gnome-panel qt-devel qt4-devel
|
|
|
-BuildRequires: ncurses-devel libgnomeui-devel
|
|
|
+BuildRequires: gtk2-devel
|
|
|
+BuildRequires: ncurses-devel
|
|
|
BuildRequires: anthy-devel m17n-lib-devel eb-devel
|
|
|
BuildRequires: gettext-devel desktop-file-utils
|
|
|
-#BuildRequires: emacs libtool automake autoconf intltool
|
|
|
+%if %{with_qt}
|
|
|
+BuildRequires: qt-devel
|
|
|
+%endif
|
|
|
+%if %{with_qt4}
|
|
|
+BuildRequires: qt4-devel
|
|
|
+%endif
|
|
|
+%if %{with_gnome}
|
|
|
+BuildRequires: gnome-panel
|
|
|
+BuildRequires: libgnomeui-devel
|
|
|
+%endif
|
|
|
+%if %{with_kde}
|
|
|
+BuildRequires: kdelibs3-devel
|
|
|
+BuildRequires: kdelibs4-devel
|
|
|
+BuildRequires: cmake
|
|
|
+%endif
|
|
|
+%if %{with_mana}
|
|
|
+BuildRequires: mana
|
|
|
+%endif
|
|
|
+%if %{with_emacsen}
|
|
|
+BuildRequires: emacsen
|
|
|
+%endif
|
|
|
|
|
|
BuildConflicts: uim-devel < 1.4.0
|
|
|
-Requires(post): ldconfig, coreutils, grep, sed
|
|
|
-Requires(postun): ldconfig, coreutils, grep, sed
|
|
|
+Requires(post): coreutils, grep, sed
|
|
|
+Requires(postun): coreutils, grep, sed
|
|
|
|
|
|
%description
|
|
|
The uim is a collection of input method for a lot of languages.
|
|
|
@@ -65,7 +100,8 @@ Summary(ja): uim の GTK ヘルパー
|
|
|
Group: User Interface/Desktops
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: gtk2
|
|
|
-Requires(post): gtk2 >= 2.10.0, %{name} = %{version}
|
|
|
+Requires(post): gtk2 >= 2.10.0
|
|
|
+Requires(post): %{name} = %{version}-%{release}
|
|
|
Requires(postun): gtk2 >= 2.10.0
|
|
|
|
|
|
%description gtk
|
|
|
@@ -78,11 +114,13 @@ input pad, candidate window, and preference tool using GTK.
|
|
|
|
|
|
%if %{with_qt}
|
|
|
%package qt
|
|
|
-Summary: Qt helper for uim
|
|
|
-Summary(ja): uim の Qt ヘルパー
|
|
|
+Summary: Qt3 support for Uim
|
|
|
+Summary(ja): uim の Qt3 サポート
|
|
|
Group: User Interface/Desktops
|
|
|
Requires: %{name}-xim = %{version}-%{release}
|
|
|
Requires: %{name}-qt-common = %{version}-%{release}
|
|
|
+Requires: qt = %{_qt3_version}
|
|
|
+
|
|
|
Obsoletes: %{name}-qt-immodule < 1.5.6-2
|
|
|
Obsoletes: uim-qtkde-helper
|
|
|
Provides: %{name}-qt-immodule = %{version}-%{release}
|
|
|
@@ -99,11 +137,12 @@ and preference tool using Qt.
|
|
|
|
|
|
%if %{with_qt4}
|
|
|
%package qt4
|
|
|
-Summary: Qt4 helper for uim
|
|
|
-Summary(ja): uim の Qt4 ヘルパー
|
|
|
+Summary: Qt4 support for Uim
|
|
|
+Summary(ja): Uim の Qt4 サポート
|
|
|
Group: User Interface/Desktops
|
|
|
Requires: %{name}-xim = %{version}-%{release}
|
|
|
Requires: %{name}-qt-common = %{version}-%{release}
|
|
|
+Requires: qt4 = %{_qt4_version}
|
|
|
|
|
|
%description qt4
|
|
|
This package contains some applications like toolbar, candidate window,
|
|
|
@@ -160,24 +199,39 @@ uim-applet は uim の入力状態を表示する GNOME2 用パネルアプレ
|
|
|
|
|
|
%if %{with_kde}
|
|
|
%package kde-applet
|
|
|
-Summary: KDE3 panel applet for Uim
|
|
|
-Summary(ja): uim の KDE3 用パネルアプレット
|
|
|
+Summary: KDE panel applet for Uim
|
|
|
+Summary(ja): uim の KDE 用パネルアプレット
|
|
|
Group: User Interface/Desktops
|
|
|
-%if %{?_dist_release} == "vl6"
|
|
|
-BuildRequires: kdelibs3-devel
|
|
|
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
|
|
|
Requires: kdelibs3
|
|
|
+Requires: %{name}-qt = %{version}-%{release}
|
|
|
%else
|
|
|
-BuildRequires: kdelibs-devel
|
|
|
-Requires: kdelibs
|
|
|
+Requires: kdelibs4
|
|
|
+Requires: %{name}-qt4 = %{version}-%{release}
|
|
|
%endif
|
|
|
Requires: %{name}-xim = %{version}-%{release}
|
|
|
-Requires: %{name}-qt = %{version}-%{release}
|
|
|
|
|
|
%description kde-applet
|
|
|
-uim-kde-applet is KDE3 panel applet for uim.
|
|
|
+uim-kde-applet is KDE panel applet for uim.
|
|
|
|
|
|
%description -l ja kde-applet
|
|
|
-uim-kde-applet は uim の入力状態を表示する KDE3 用パネルアプレットです。
|
|
|
+uim-kde-applet は uim の入力状態を表示する KDE 用パネルアプレットです。
|
|
|
+
|
|
|
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
|
|
|
+%package kde4-applet
|
|
|
+Summary: KDE4 panel applet for Uim
|
|
|
+Summary(ja): uim の KDE4 用パネルアプレット
|
|
|
+Group: User Interface/Desktops
|
|
|
+Requires: kdelibs4
|
|
|
+Requires: %{name}-qt4 = %{version}-%{release}
|
|
|
+Requires: %{name}-xim = %{version}-%{release}
|
|
|
+
|
|
|
+%description kde4-applet
|
|
|
+uim-kde-applet is KDE4 panel applet for uim.
|
|
|
+
|
|
|
+%description -l ja kde4-applet
|
|
|
+uim-kde-applet は uim の入力状態を表示する KDE4 用パネルアプレットです。
|
|
|
+%endif
|
|
|
%endif
|
|
|
|
|
|
%package fep
|
|
|
@@ -270,9 +324,10 @@ This package provides support for mana, a Japanese input method.
|
|
|
Summary: Emacsen uim bridge
|
|
|
Summary(ja): Emacsen-uim ブリッジ
|
|
|
Group: Applications/Editors/Emacs
|
|
|
-PreReq: emacsen-common
|
|
|
-Requires: %{name} = %{version}-%{release}, emacsen
|
|
|
-BuildRequires: emacsen
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: emacsen
|
|
|
+Requires(post): emacsen-common
|
|
|
+Requires(preun): emacsen-common
|
|
|
|
|
|
%description el
|
|
|
uim.el is a bridge software between Emacsen and uim.
|
|
|
@@ -294,7 +349,7 @@ Requires: uim = %{version}-%{release}
|
|
|
Requires(post): gtk2 /usr/bin/uim-module-manager
|
|
|
Requires(postun): gtk2 /usr/bin/uim-module-manager
|
|
|
|
|
|
-%description m17n
|
|
|
+%description m17n
|
|
|
This package provides support for m17n-lib, which allows input of
|
|
|
many languages using the input table map from m17n-db.
|
|
|
|
|
|
@@ -314,10 +369,12 @@ uim-devel パッケージには libuim を利用したアプリケーション
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n %{name}-%{version}%{?extraver:-%extraver}
|
|
|
+%patch0 -p0
|
|
|
|
|
|
%build
|
|
|
%if %{with_qt}
|
|
|
-export QTDIR=%{qtdir}
|
|
|
+unset QTDIR
|
|
|
+export QTDIR=%{_qt3_prefix}
|
|
|
%endif
|
|
|
|
|
|
%configure --with-x --with-xft \
|
|
|
@@ -340,14 +397,18 @@ export QTDIR=%{qtdir}
|
|
|
--without-qt-immodule \
|
|
|
%endif
|
|
|
%if %{with_qt4}
|
|
|
+ --with-qt4 \
|
|
|
--with-qt4-immodule \
|
|
|
%else
|
|
|
+ --without-qt4 \
|
|
|
--without-qt4-immodule \
|
|
|
%endif
|
|
|
%if %{with_kde}
|
|
|
--enable-kde-applet \
|
|
|
+ --enable-kde4-applet \
|
|
|
%else
|
|
|
--disable-kde-applet \
|
|
|
+ --disable-kde4-applet \
|
|
|
%endif
|
|
|
%if %{with_canna}
|
|
|
--with-canna \
|
|
|
@@ -363,11 +424,17 @@ export QTDIR=%{qtdir}
|
|
|
--without-mana
|
|
|
%endif
|
|
|
|
|
|
-#%if %{with_qtimm}
|
|
|
-# --with-qt-immodule \
|
|
|
-#%else
|
|
|
-# --without-qt-immodule \
|
|
|
-#%endif
|
|
|
+# generate Makefile properly for kde4-applets (ad-hoc)
|
|
|
+%if %{with_kde}
|
|
|
+pushd qt4/toolbar/build
|
|
|
+QTDIR=%{_qt4_prefix} %{cmake} \
|
|
|
+ -DCMAKE_BUILD_TYPE=release \
|
|
|
+ -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
|
|
|
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
|
|
|
+ -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
|
|
|
+ ..
|
|
|
+popd
|
|
|
+%endif
|
|
|
|
|
|
sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
|
|
|
LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs:$LD_LIBRARY_PATH make
|
|
|
@@ -396,7 +463,8 @@ make install DESTDIR=%{buildroot}
|
|
|
%__rm -f %{buildroot}%{_libdir}/uim/plugin/*.{a,la}
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/pixmaps/scim.*
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/pixmaps/prime*.*
|
|
|
-%__rm -f %{buildroot}%{qtdir}/plugins/inputmethods/*.{a,la}
|
|
|
+%__rm -f %{buildroot}%{_qt3_plugindir}/inputmethods/*.{a,la}
|
|
|
+%__rm -f %{buildroot}%{_qt4_plugindir}/inputmethods/*.{a,la}
|
|
|
|
|
|
%if ! %{with_canna}
|
|
|
%__rm -f %{buildroot}%{_libdir}/uim/plugin/libuim-canna.so
|
|
|
@@ -411,12 +479,14 @@ make install DESTDIR=%{buildroot}
|
|
|
%__rm -f %{buildroot}%{_datadir}/uim/pixmaps/mana.*
|
|
|
%endif
|
|
|
|
|
|
-%if %{with_qt}
|
|
|
-#find_lang %{name}-chardict-qt
|
|
|
-%else
|
|
|
+%if ! %{with_qt}
|
|
|
%__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt.mo
|
|
|
%endif
|
|
|
|
|
|
+%if ! %{with_qt4}
|
|
|
+%__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt4.mo
|
|
|
+%endif
|
|
|
+
|
|
|
%if %{with_emacsen}
|
|
|
%__mkdir_p %{buildroot}%{_prefix}/lib/emacsen-common/packages/install
|
|
|
%__mkdir_p %{buildroot}%{_prefix}/lib/emacsen-common/packages/remove
|
|
|
@@ -567,34 +637,43 @@ fi
|
|
|
%{_datadir}/applications/uim.desktop
|
|
|
|
|
|
%if %{with_qt}
|
|
|
-#%files qt -f %{name}-chardict-qt.lang
|
|
|
%files qt
|
|
|
%defattr(-,root,root)
|
|
|
-%doc AUTHORS COPYING ChangeLog* NEWS README
|
|
|
-%{qtdir}/plugins/inputmethods/*.so
|
|
|
+# BSD and LGPLv2+
|
|
|
+%{_bindir}/uim-chardict-qt
|
|
|
+# BSD
|
|
|
+%{_bindir}/uim-im-switcher-qt
|
|
|
+# BSD and LGPLv2+
|
|
|
+%{_bindir}/uim-pref-qt
|
|
|
+# BSD
|
|
|
+%{_bindir}/uim-toolbar-qt
|
|
|
+%{_libexecdir}/uim-candwin-qt
|
|
|
+%{_qt3_plugindir}/inputmethods/*.so
|
|
|
+%{_datadir}/locale/*/*/uim-chardict-qt.mo
|
|
|
%endif
|
|
|
|
|
|
%if %{with_qt4}
|
|
|
%files qt4
|
|
|
%defattr(-,root,root)
|
|
|
-%doc AUTHORS COPYING ChangeLog* NEWS qt4/immodule/README.en
|
|
|
+%lang(en) %doc qt4/immodule/README.en
|
|
|
%lang(ja) %doc qt4/immodule/README.ja
|
|
|
-%{_libdir}/qt-4*/plugins/inputmethods/*.so
|
|
|
+# BSD and LGPLv2+
|
|
|
+%{_bindir}/uim-chardict-qt4
|
|
|
+# BSD
|
|
|
+%{_bindir}/uim-im-switcher-qt4
|
|
|
+# BSD and LGPLv2+
|
|
|
+%{_bindir}/uim-pref-qt4
|
|
|
+# BSD
|
|
|
+%{_bindir}/uim-toolbar-qt4
|
|
|
+%{_libexecdir}/uim-candwin-qt4
|
|
|
+%{_qt4_plugindir}/inputmethods/*.so
|
|
|
+%{_datadir}/locale/*/*/uim-chardict-qt4.mo
|
|
|
%endif
|
|
|
|
|
|
%if (%{with_qt}%{with_qt4})
|
|
|
%files qt-common
|
|
|
%defattr(-,root,root)
|
|
|
%doc AUTHORS COPYING ChangeLog* NEWS README
|
|
|
-# BSD and LGPLv2+
|
|
|
-%{_bindir}/uim-chardict-qt
|
|
|
-# BSD
|
|
|
-%{_bindir}/uim-im-switcher-qt
|
|
|
-# BSD and LGPLv2+
|
|
|
-%{_bindir}/uim-pref-qt
|
|
|
-# BSD
|
|
|
-%{_bindir}/uim-toolbar-qt
|
|
|
-%{_libexecdir}/uim-candwin-qt
|
|
|
%endif
|
|
|
|
|
|
#%if %{with_qtimm}
|
|
|
@@ -612,8 +691,21 @@ fi
|
|
|
%if %{with_kde}
|
|
|
%files kde-applet
|
|
|
%defattr(-,root,root)
|
|
|
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
|
|
|
%{_libdir}/kde3/uim_panelapplet.*
|
|
|
%{_datadir}/apps/kicker/applets/uimapplet.desktop
|
|
|
+
|
|
|
+%files kde4-applet
|
|
|
+%defattr(-,root,root)
|
|
|
+%{_libdir}/kde4/plasma_applet_uim.*
|
|
|
+%{_datadir}/kde4/services/plasma-applet-uim.desktop
|
|
|
+%else
|
|
|
+%{_libdir}/kde4/plasma_applet_uim.*
|
|
|
+%{_datadir}/kde4/services/plasma-applet-uim.desktop
|
|
|
+%exclude %{_libdir}/kde3/uim_panelapplet.*
|
|
|
+%exclude %{_datadir}/apps/kicker/applets/uimapplet.desktop
|
|
|
+
|
|
|
+%endif
|
|
|
%endif
|
|
|
|
|
|
%files fep
|
|
|
@@ -683,6 +775,16 @@ fi
|
|
|
%{_libdir}/pkgconfig/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.7-1
|
|
|
+- new upstream release
|
|
|
+- added Patch0
|
|
|
+- added BR: cmake
|
|
|
+- provides KDE4 applets
|
|
|
+- updated Qt version auto detection macros
|
|
|
+
|
|
|
+* Sun Jan 31 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.6-6
|
|
|
+- updated Qt version detection macros to build properly
|
|
|
+
|
|
|
* Fri Jan 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.6-5
|
|
|
- rebuilt with qt-4.6.1
|
|
|
|
inagaki