|
|
@@ -1,32 +1,24 @@
|
|
|
%define name scim-bridge
|
|
|
%define version 0.4.16
|
|
|
-%define release 10%{?_dist_release}
|
|
|
+%define release 11%{?_dist_release}
|
|
|
+
|
|
|
+%define qt3_ver 3.3.8
|
|
|
+%define qt4_ver 4.6.3
|
|
|
|
|
|
# build qt3 immodule ("--without qt3" to disable qt3)
|
|
|
%bcond_without qt3
|
|
|
-# ugly hack for Qt3 version auto-detection -- inagaki
|
|
|
-%define _qt3_notfound %(eval "rpm -q qt-devel > /dev/null"; echo $?)
|
|
|
-%if %{_qt3_notfound}
|
|
|
-%define _qt3_version 3.3.8
|
|
|
-%else
|
|
|
-%define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel)
|
|
|
-%endif
|
|
|
+# 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
|
|
|
-# ugly hack for Qt4 version auto-detection -- inagaki
|
|
|
-%define _qt4_notfound %(eval "pkg-config --exists Qt"; echo $?)
|
|
|
-%if %{_qt4_notfound}
|
|
|
-%define _qt4_version 4.6.1
|
|
|
-%define _qt4_prefix %{_libdir}/qt-%{_qt4_version}
|
|
|
-%define _qt4_plugindir %{_qt4_prefix}/plugins
|
|
|
-%else
|
|
|
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt)
|
|
|
-%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt)
|
|
|
-%define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt)
|
|
|
-%endif
|
|
|
+# 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)
|
|
|
+
|
|
|
|
|
|
Summary: yet another IM client of SCIM
|
|
|
Summary(ja): もう一つ別の SCIM IM クライアント
|
|
|
@@ -192,6 +184,9 @@ export QT4_PREFIX=%{_qt4_prefix}
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Jul 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-11
|
|
|
+- rebuilt with qt4-4.6.3
|
|
|
+
|
|
|
* Tue Jun 22 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.4.16-10
|
|
|
- used %{?_smp_mflags} macro on build
|
|
|
- deleted in unused log in changelog
|
inagaki