From 42ceccd600f477ade816fb97f0683905a48cce92 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Aug 21 2021 12:37:01 +0000
Subject: Remove references to quazip


---

diff --git a/qcad.spec b/qcad.spec
index b4447df..501bb7b 100644
--- a/qcad.spec
+++ b/qcad.spec
@@ -8,7 +8,7 @@
 
 Name:    qcad
 Version: 3.26.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Powerful 2D CAD system
 
 ## Main license: GPLv3
@@ -40,10 +40,8 @@ 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 >= 5.9.0
 Requires: qt5-qtsvg
-Requires: quazip-qt5%{?_isa}
 Provides: bundled(qtscriptgenerator) = 5.9.0
 BuildRequires: gcc-c++, chrpath
 BuildRequires: libX11-devel
@@ -71,7 +69,7 @@ Provides: bundled(dxflib) = 1.0.0
 Provides: bundled(opennurbs) = 201004095
 Provides: bundled(stemmer) = 1.0.0
 
-## Unbundle spatialindex and quazip libraries
+## Unbundle spatialindex libraries
 Patch0: %{name}-qt5-unbundle_libraries.patch
 
 %description
@@ -87,10 +85,6 @@ You dont need any CAD experience to get started with QCAD immediately.
 %prep
 %autosetup -n %{name}-%{version} -p0
 
-# Use bundled spatialindex-1.8.5
-#rm -rf src/3rdparty/spatialindexnavel/include/spatialindex
-rm -f src/3rdparty/quazip/src/*.h
-
 %build
 # QT is known not to work properly with LTO at this point.  Some of the issues
 # are being worked on upstream and disabling LTO should be re-evaluated as
@@ -99,8 +93,8 @@ rm -f src/3rdparty/quazip/src/*.h
 %define _lto_cflags %{nil}
 
 %{_qt5_qmake} -makefile CONFIG+=release %{name}.pro \
- QMAKE_CFLAGS_RELEASE+="%{_qt5_optflags} -I%{_includedir}/quazip5 -I%{_qt5_includedir}/QtUiTools -I$PWD/src/3rdparty/spatialindexnavel/include" \
- QMAKE_CXXFLAGS_RELEASE+="%{_qt5_optflags} -I%{_includedir}/quazip5 -I%{_qt5_includedir}/QtUiTools -I$PWD/src/3rdparty/spatialindexnavel/include" \
+ QMAKE_CFLAGS_RELEASE+="%{_qt5_optflags} %(pkg-config --cflags Qt5UiTools) -I$PWD/src/3rdparty/spatialindexnavel/include" \
+ QMAKE_CXXFLAGS_RELEASE+="%{_qt5_optflags} %(pkg-config --cflags Qt5UiTools) -I$PWD/src/3rdparty/spatialindexnavel/include" \
  QMAKE_LFLAGS+="%{_qt5_ldflags} -Wl,-rpath -Wl,%{_QCAD_DIR}" \
  LFLAGS+="%{_qt5_ldflags} -Wl,-rpath -Wl,%{_QCAD_DIR}"
 %make_build
@@ -228,6 +222,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_mandir}/man1/*
 
 %changelog
+* Sat Aug 21 2021 Antonio Trande <sagitter@fedoraproject.org> - 3.26.3.0-4
+- Remove references to quazip
+
 * Thu Aug 19 2021 Björn Esser <besser82@fedoraproject.org> - 3.26.3.0-3
 - Rebuild (quazip)