From c9ab2a959dda47f4ef29f730d015d98c83855051 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: May 27 2017 15:46:36 +0000
Subject: Update to 3.17.1.1 and use Qt5


---

diff --git a/.gitignore b/.gitignore
index 53bb84a..e84377d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /qcad-3.16.4.0.tar.gz
 /qcad-3.16.5.0.tar.gz
 /qcad-3.16.7.0.tar.gz
+/qcad-3.17.1.1.tar.gz
diff --git a/qcad-fix-detection-modules.patch b/qcad-fix-detection-modules.patch
deleted file mode 100644
index be04108..0000000
--- a/qcad-fix-detection-modules.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qcad.orig.pro	2017-03-20 23:46:39.000000000 +0100
-+++ qcad.pro	2017-03-30 13:11:16.484973771 +0200
-@@ -13,7 +13,7 @@
-     }
- }
- else {
--    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v qcadmobile")
-+    SUBDIRS += $$system("ls -d ../qcad?* 2>/dev/null | grep -v $(basename $(pwd))$ | grep -v qcadmobile")
- }
- 
- !r_mobile {
diff --git a/qcad.spec b/qcad.spec
index be1e74d..0b1bf2b 100644
--- a/qcad.spec
+++ b/qcad.spec
@@ -10,18 +10,16 @@
 %global __requires_exclude %{__requires_exclude}|libqcadspatialindex.so
 #
 
-## Still built with QT4
 ## QCAD does not properly work with QT5 because of QT5 bug:
 ## https://bugreports.qt.io/browse/QTBUG-52988
+## Supported platforms: http://www.qcad.org/en/qcad-documentation/supported-platforms
 
 ## Qt5 builds ?
-%bcond_with qt5
+%bcond_without qt5
 #
-
 ## Qt4 builds ?
-%bcond_without qt4
-#
-##
+%bcond_with qt4
+
 
 %global _QCAD_DIR %{_libdir}/%{name}
 
@@ -34,8 +32,8 @@
 %endif
 
 Name:    qcad
-Version: 3.16.7.0
-Release: 2%{?dist}
+Version: 3.17.1.1
+Release: 1%{?dist}
 Summary: Powerful 2D CAD system
 
 ## Main license: GPLv3
@@ -60,16 +58,18 @@ Source2: %{name}.appdata.xml
 URL: http://www.ribbonsoft.com/en/
 
 %if %{with qt5}
-BuildRequires: qt5-qtbase-devel, qt5-rpm-macros
-BuildRequires: qt5-qtwebkit-devel
-BuildRequires: qt5-qttools-devel, qt5-qttools-static
-BuildRequires: qt5-qtscript-devel
-BuildRequires: qt5-qtsvg-devel
-BuildRequires: qt5-qtxmlpatterns-devel
+BuildRequires: qt5-qtbase-devel >= 5.9.0
+BuildRequires: qt5-rpm-macros >= 5.9.0
+BuildRequires: qt5-qtwebkit-devel >= 5.9.0
+BuildRequires: qt5-qttools-devel >= 5.9.0
+BuildRequires: qt5-qttools-static >= 5.9.0
+BuildRequires: qt5-qtscript-devel >= 5.9.0
+BuildRequires: qt5-qtsvg-devel >= 5.9.0
+BuildRequires: qt5-qtxmlpatterns-devel >= 5.9.0
 BuildRequires: quazip-qt5-devel
-Requires: qt5-designer
+Requires: qt5-designer >= 5.9.0
 Requires: quazip-qt5%{?_isa}
-Provides: bundled(qtscriptgenerator) = 5.5.0
+Provides: bundled(qtscriptgenerator) = 5.9.0
 %endif
 %if %{with qt4}
 BuildRequires: qt-devel
@@ -106,9 +106,6 @@ Patch0: %{name}-qt4-unbundle_libraries.patch
 ## Unbundle spatialindex and quazip libraries
 Patch1: %{name}-qt5-unbundle_libraries.patch
 
-## Fix detection of QCAD modules
-Patch2: %{name}-fix-detection-modules.patch
-
 %description
 QCAD is an application for computer aided drafting (CAD) in two dimensions (2D).
 With QCAD you can create technical drawings such as plans for buildings,
@@ -129,8 +126,6 @@ You don't need any CAD experience to get started with QCAD immediately.
 %patch1 -p0
 %endif
 
-%patch2 -p0
-
 rm -rf src/3rdparty/spatialindexnavel/include/spatialindex
 rm -f src/3rdparty/quazip/src/*.h
 
@@ -280,6 +275,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri May 26 2017 Antonio Trande <sagitter AT fedoraproject.org> - 3.17.1.1-1
+- Update to 3.17.1.1
+- Built Qt5 (5.9.0)
+
 * Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.16.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 3972611..79661ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qcad-3.16.7.0.tar.gz) = 0428b7a66b777ca5f10f7622cb0066ef4bd5a93b8f826ac7a2f5532f746a0d4437e46fb40c6316ea453f389c5a58f775f2dd72a609224080ee344bc597de2127
+SHA512 (qcad-3.17.1.1.tar.gz) = a07ccfd4d9e294afcb7b490120a69572cc4854ddbbc488945d4134d3d8aa4511b8aefdc272bc6f3074b3abcca0c686f306bda7b73173a07e1078f2ddf2ff1467