[packages/qesteidutil] add qt5 bcond, ensure consistent build

glen glen at pld-linux.org
Sun Feb 22 17:54:19 CET 2015


commit 646e359d9361c6a00714795b0ec6b8fd12b6304b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Feb 22 18:54:05 2015 +0200

    add qt5 bcond, ensure consistent build

 qesteidutil.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/qesteidutil.spec b/qesteidutil.spec
index fe63228..538b947 100644
--- a/qesteidutil.spec
+++ b/qesteidutil.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	qt5		# Use Qt5 (instead of Qt4)
+
 Summary:	Estonian ID card utility
 Name:		qesteidutil
 Version:	3.8.0.1106
@@ -9,15 +13,23 @@ Source0:	https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
 #Patch0: %{name}-0.3.0-system_qtsingleapplication.patch
 Patch1:		desktop.patch
 URL:		http://www.ria.ee/
-BuildRequires:	QtSingleApplication-devel
-BuildRequires:	QtWebKit-devel
-BuildRequires:	QtXmlPatterns-devel
 BuildRequires:	cmake >= 2.8
 BuildRequires:	desktop-file-utils
 BuildRequires:	libp11-devel
 BuildRequires:	openssl-devel
+%if %{with qt5}
+BuildRequires:	Qt5WebKit-devel
+BuildRequires:	Qt5Widgets-devel
+BuildRequires:	qt5-build
+BuildRequires:	qt5-linguist
+%else
+BuildRequires:	QtSingleApplication-devel
+BuildRequires:	QtWebKit-devel
+BuildRequires:	QtXmlPatterns-devel
 BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
+BuildConflicts:	Qt5Widgets-devel
+%endif
 BuildRequires:	smartcardpp-devel
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qesteidutil.git/commitdiff/646e359d9361c6a00714795b0ec6b8fd12b6304b



More information about the pld-cvs-commit mailing list