[packages/qt4] - handle icu ABI version by single define

qboosh qboosh at pld-linux.org
Mon Apr 15 19:01:26 CEST 2013


commit 1788f84093b528673c7605b68a197c750d218169
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 15 19:00:12 2013 +0200

    - handle icu ABI version by single define

 qt4.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/qt4.spec b/qt4.spec
index 1dad4d2..bc87168 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -46,6 +46,9 @@
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
 
+%define		icu_abi		49
+%define		next_icu_abi	%(echo $((%{icu_abi} + 1)))
+
 Summary:	The Qt GUI application framework
 Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
@@ -102,8 +105,8 @@ BuildRequires:	glib2-devel >= 2.0.0
 BuildRequires:	gstreamer0.10-plugins-base-devel
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.10}
 # see dependency on libicu version below
-BuildRequires:	libicu-devel < 50
-BuildRequires:	libicu-devel >= 49
+BuildRequires:	libicu-devel >= %{icu_abi}
+BuildRequires:	libicu-devel < %{next_icu_abi}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel >= 1.0.0
 BuildRequires:	libpng-devel >= 2:1.0.8
@@ -263,11 +266,10 @@ Summary(pl.UTF-8):	Podstawowe klasy Qt używane przez inne moduły
 Group:		X11/Libraries
 %requires_eq	libicu
 # be sure to depend on proper arch.
-%ifarch %{ix86}
-Requires:	libicui18n.so.49
-%endif
-%ifarch %{x8664}
-Requires:	libicui18n.so.49()(64bit)
+%ifarch %{x8664} ppc64 sparc64 s390x
+Requires:	libicui18n.so.%{icu_abi}()(64bit)
+%else
+Requires:	libicui18n.so.%{icu_abi}
 %endif
 Obsoletes:	QtAssistant
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/91bcba721f047a4a2011f0132c2c54f35ede5fe7



More information about the pld-cvs-commit mailing list