[packages/qesteidutil/dev-3.12: 1/3] up to 3.12.10; qt5 only

[glen]

commit 7dca1765bd9aad3d2721941f215318874bb50529
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 22 09:01:30 2018 +0300

    up to 3.12.10; qt5 only

 qesteidutil.spec                 | 32 ++++++++++----------------------
 system_qtsingleapplication.patch | 22 ++++++----------------
 2 files changed, 16 insertions(+), 38 deletions(-)
---
diff --git a/qesteidutil.spec b/qesteidutil.spec
index fea9c0f..91da349 100644
--- a/qesteidutil.spec
+++ b/qesteidutil.spec
@@ -1,37 +1,25 @@
-#
-# Conditional build:
-%bcond_with	qt5		# Use Qt5 (instead of Qt4)
-
-%define		qt4ver	4.8.0
 Summary:	Estonian ID card utility
 Name:		qesteidutil
-Version:	3.8.0.1106
+Version:	3.12.10
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
-# Source0-md5:	4e5a792fa4de027d367a26b4f0b82ac1
+Source0:	https://github.com/open-eid/qesteidutil/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	4e3805d3449e94427a67f5dfe7bae3c9
 Patch0:		system_qtsingleapplication.patch
 Patch1:		desktop.patch
-URL:		http://www.ria.ee/
-BuildRequires:	cmake >= 2.8
+URL:		https://github.com/open-eid/qesteidutil
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5Network-devel
+BuildRequires:	Qt5SingleApplication-devel
+BuildRequires:	Qt5Widgets-devel
+BuildRequires:	cmake >= 3.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	openssl-devel
 BuildRequires:	pcsc-lite-devel
-%if %{with qt5}
-BuildRequires:	Qt5Network-devel
-BuildRequires:	Qt5Widgets-devel
 BuildRequires:	qt5-build
 BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qmake
-%else
-BuildRequires:	QtGui-devel >= %{qt4ver}
-BuildRequires:	QtNetwork-devel >= %{qt4ver}
-BuildRequires:	QtSingleApplication-devel >= 2.6.1
-BuildRequires:	qt4-build
-BuildRequires:	qt4-linguist
-BuildConflicts:	Qt5Widgets-devel
-%endif
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
 Requires:	hicolor-icon-theme
@@ -50,7 +38,7 @@ extract and view certificates, set up mobile ID, and configure
 %patch1 -p1
 
 # Remove bundled qtsingleapplication to make sure it isn't used
-rm -r qtsingleapplication
+rm -r common/qtsingleapplication
 
 %build
 install -d build
diff --git a/system_qtsingleapplication.patch b/system_qtsingleapplication.patch
index ac48d0e..5503337 100644
--- a/system_qtsingleapplication.patch
+++ b/system_qtsingleapplication.patch
@@ -1,25 +1,15 @@
---- qesteidutil-3.8.0.1106/CMakeLists.txt~	2013-12-02 12:10:51.000000000 +0200
-+++ qesteidutil-3.8.0.1106/CMakeLists.txt	2015-02-22 19:41:23.932238031 +0200
-@@ -54,7 +54,6 @@
- 	${CMAKE_BINARY_DIR}
- 	${OPENSSL_INCLUDE_DIR}
- 	${PCSCLITE_INCLUDE_DIR}
--	qtsingleapplication/src
- )
- 
- add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE
---- qesteidutil-3.8.0.1106/common/CMakeLists.txt~	2013-06-05 16:01:05.000000000 +0300
-+++ qesteidutil-3.8.0.1106/common/CMakeLists.txt	2015-02-22 19:42:43.412893984 +0200
-@@ -27,8 +27,7 @@
- 	endif()
+--- qesteidutil-3.12.10/common/CMakeLists.txt~	2017-11-22 14:34:35.000000000 +0200
++++ qesteidutil-3.12.10/common/CMakeLists.txt	2018-08-22 08:52:33.867141765 +0300
+@@ -44,8 +44,7 @@
+ 	set( LIBRARIES "-framework Cocoa -framework PCSC -fobjc-arc" )
  else()
  	include_directories( ${CMAKE_SOURCE_DIR} )
--	add_subdirectory( ../qtsingleapplication ${CMAKE_BINARY_DIR}/qtsingleapplication )
+-	add_subdirectory( qtsingleapplication )
 -	list( APPEND LIBRARIES qtsingleapplication )
 +	list( APPEND LIBRARIES QtSolutions_SingleApplication-2.6)
  endif()
  
- set( TS_FILES
+ configure_file( translations/common_tr.qrc common_tr.qrc COPYONLY )
 --- qesteidutil-3.8.0.1106/common/Common.h~	2013-12-02 11:48:37.000000000 +0200
 +++ qesteidutil-3.8.0.1106/common/Common.h	2015-02-22 20:09:05.556946877 +0200
 @@ -32,7 +32,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qesteidutil.git/commitdiff/2af9cd256a9982af15b2700808ae84fc52267a5c