Browse Source

update: scim-bridge

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5389 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 12 years ago
parent
commit
49b1583c9a
1 changed files with 8 additions and 6 deletions
  1. 8 6
      s/scim-bridge/scim-bridge-vl.spec

+ 8 - 6
s/scim-bridge/scim-bridge-vl.spec

@@ -2,15 +2,14 @@
 
 %define name scim-bridge
 %define version 0.4.16
-%define release 15%{?_dist_release}
+%define release 16%{?_dist_release}
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 
 # build qt3 immodule ("--without qt3" to disable qt3)
 %bcond_without qt3
-# Qt3 version auto-detection -- inagaki
-%define _qt3_version %(rpm -q --queryformat "%%{version}" qt-devel 2>/dev/null || echo %{qt3_ver})
+%define _qt3_version 3.3.8
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
 %define _qt3_plugindir %{_qt3_prefix}/plugins
 
@@ -18,7 +17,7 @@
 %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_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 
@@ -102,7 +101,7 @@ Summary:        SCIM Bridge Qt4 IM Module
 Summary(ja):    SCIM Bridge Qt4 IM モジュール
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt4 = %{_qt4_version}
+Requires:       qt4 >= %{_qt4_version}
 BuildRequires:  qt4-devel
 
 %description qt4
@@ -265,6 +264,9 @@ export QT4_PREFIX=%{_qt4_prefix}
 
 
 %changelog
+* Tue Jan 10 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-16
+- rebuilt with qt4-4.8.0
+
 * Tue Mar  8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.16-15
 - rebuilt with qt4-4.7.2