|
|
@@ -1,19 +1,32 @@
|
|
|
%define name scim-bridge
|
|
|
%define version 0.4.16
|
|
|
-%define release 7%{?_dist_release}
|
|
|
+%define release 8%{?_dist_release}
|
|
|
|
|
|
# build qt3 immodule ("--without qt3" to disable qt3)
|
|
|
%bcond_without qt3
|
|
|
-%define qt3ver %(rpm -q --queryformat '%%{version}' qt)
|
|
|
-%define qt3rel %(rpm -q --queryformat '%%{release}' qt)
|
|
|
-%define qt3dir %{_libdir}/qt-%{qt3ver}
|
|
|
+# 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
|
|
|
+%define _qt3_prefix %{_libdir}/qt-%{_qt3_version}
|
|
|
+%define _qt3_plugindir %{_qt3_prefix}/plugins
|
|
|
|
|
|
# build qt4 immodule ("--without qt4" to disable qt4)
|
|
|
%bcond_without qt4
|
|
|
-%define qt4ver %(rpm -q --queryformat '%%{version}' qt4)
|
|
|
-%define qt4rel %(rpm -q --queryformat '%%{release}' qt4)
|
|
|
-%define _qt4_prefix %(pkg-config --variable prefix Qt)
|
|
|
-%define _qt4_plugindir %(pkg-config --variable plugindir Qt)
|
|
|
+# 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
|
|
|
|
|
|
Summary: yet another IM client of SCIM
|
|
|
Summary(ja): もう一つ別の SCIM IM クライアント
|
|
|
@@ -35,13 +48,15 @@ Patch4: scim-bridge-0.4.15-EOF.patch
|
|
|
|
|
|
Patch5: scim-bridge-0.4.15-hotkey-help.patch
|
|
|
|
|
|
-Url: http://www.scim-im.org/projects/scim_bridge
|
|
|
+URL: http://www.scim-im.org/projects/scim_bridge
|
|
|
License: GPL/LGPL
|
|
|
Group: System Environment/Libraries
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
Prefix: %{_prefix}
|
|
|
Requires: scim >= 1.4
|
|
|
-BuildRequires: scim-devel >= 1.4 pkgconfig >= 0.9.0, gtk2-devel >= 2.14.0
|
|
|
+BuildRequires: scim-devel >= 1.4
|
|
|
+BuildRequires: pkgconfig >= 0.9.0
|
|
|
+BuildRequires: gtk2-devel >= 2.14.0
|
|
|
|
|
|
%description
|
|
|
Scim-bridge is yet another IM client of SCIM.
|
|
|
@@ -57,7 +72,8 @@ Summary(ja): SCIM Bridge GTK IM モジュール
|
|
|
Group: System Environment/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: gtk2 >= 2.14.0
|
|
|
-PreReq: gtk2 >= 2.14.0
|
|
|
+Requires(post): gtk2 >= 2.14.0
|
|
|
+Requires(postun): gtk2 >= 2.14.0
|
|
|
Obsoletes: %{name} <= 0.1.7
|
|
|
|
|
|
%description gtk
|
|
|
@@ -72,9 +88,8 @@ Summary: SCIM Bridge Qt IM Module
|
|
|
Summary(ja): SCIM Bridge Qt IM モジュール
|
|
|
Group: System Environment/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-#Requires: qt = %{qt3ver}-%{qt3rel}
|
|
|
-Requires: qt = %{qt3ver}
|
|
|
-BuildRequires: qt-devel >= %{qt3ver}-%{qt3rel}
|
|
|
+Requires: qt = %{_qt3_version}
|
|
|
+BuildRequires: qt-devel
|
|
|
|
|
|
%description qt
|
|
|
This package provides the SCIM Bridge Qt IM module.
|
|
|
@@ -89,9 +104,8 @@ Summary: SCIM Bridge Qt4 IM Module
|
|
|
Summary(ja): SCIM Bridge Qt4 IM モジュール
|
|
|
Group: System Environment/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-#Requires: qt4 = %{qt4ver}-%{qt4rel}
|
|
|
-Requires: qt4 = %{qt4ver}
|
|
|
-BuildRequires: qt4-devel >= %{qt4ver}-%{qt4rel}
|
|
|
+Requires: qt4 = %{_qt4_version}
|
|
|
+BuildRequires: qt4-devel
|
|
|
|
|
|
%description qt4
|
|
|
This package provides the SCIM Bridge Qt4 IM module.
|
|
|
@@ -111,7 +125,7 @@ This package provides the SCIM Bridge Qt4 IM module.
|
|
|
|
|
|
%build
|
|
|
%if !%{without qt3}
|
|
|
-export QT3_PREFIX=%{qt3dir}
|
|
|
+export QT3_PREFIX=%{_qt3_prefix}
|
|
|
%endif
|
|
|
%if !%{without qt4}
|
|
|
export QT4_PREFIX=%{_qt4_prefix}
|
|
|
@@ -139,7 +153,7 @@ export QT4_PREFIX=%{_qt4_prefix}
|
|
|
|
|
|
# remove unneeded files
|
|
|
%__rm -f %{buildroot}%{_libdir}/gtk-2.0/immodules/*.{a,la}
|
|
|
-%__rm -f %{buildroot}%{qt3dir}/plugins/inputmethods/*.{a,la}
|
|
|
+%__rm -f %{buildroot}%{_qt3_plugindir}/inputmethods/*.{a,la}
|
|
|
%__rm -f %{buildroot}%{_qt4_plugindir}/inputmethods/*.{a,la}
|
|
|
|
|
|
%clean
|
|
|
@@ -163,7 +177,7 @@ export QT4_PREFIX=%{_qt4_prefix}
|
|
|
%if !%{without qt3}
|
|
|
%files qt
|
|
|
%defattr(-,root,root)
|
|
|
-%{qt3dir}/plugins/inputmethods/*.so
|
|
|
+%{_qt3_plugindir}/inputmethods/*.so
|
|
|
%endif
|
|
|
|
|
|
%if !%{without qt4}
|
|
|
@@ -173,6 +187,9 @@ export QT4_PREFIX=%{_qt4_prefix}
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 31 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-8
|
|
|
+- updated Qt version detection macros to build properly
|
|
|
+
|
|
|
* Fri Jan 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-7
|
|
|
- rebuilt with qt4-4.6.1
|
|
|
|
inagaki