From b1f31d037943bbc56bd236f48f78ff061f2552a5 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Nov 06 2020 14:40:24 +0000
Subject: Switch to bundled proj on F34+, proj 7 is not supported


* Fri Nov 06 2020 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.2.2-0.39.20140317git169da60c
- Switch to bundled proj on F34+, proj 7 is not supported

---

diff --git a/qt-mobility.spec b/qt-mobility.spec
index bdc6b70..5d0f138 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -9,7 +9,7 @@
 Name:    qt-mobility
 Summary: Qt Mobility Framework
 Version: 1.2.2
-Release: 0.38.%{snap}git%{git_short}%{?dist}
+Release: 0.39.%{snap}git%{git_short}%{?dist}
 
 License: LGPLv2 with exceptions
 URL:     https://code.qt.io/cgit/qt-mobility/qt-mobility.git
@@ -63,7 +63,12 @@ BuildRequires: pkgconfig(QtDeclarative)
 BuildRequires: pkgconfig(QtGui) pkgconfig(QtOpenGL)
 BuildRequires: pkgconfig(QtNetwork) >= 4.7
 BuildRequires: pkgconfig(xv)
+%if 0%{?fedora} < 34 && 0%{?rhel} <= 8
 BuildRequires: proj-devel
+%else
+%global bundled_proj 1
+Provides:      bundled(proj) = 4.7.0
+%endif
 BuildRequires: perl
 
 Provides: qt4-mobility = %{version}-%{release}
@@ -242,7 +247,9 @@ Requires: %{name}-organizer%{?_isa} = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-opensource-src-%{version}
+%if ! 0%{?bundled_proj}
 rm -r src/3rdparty/proj
+%endif
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .proj6
@@ -446,6 +453,9 @@ cp -a doc/html/* %{buildroot}%{_qt4_docdir}/html/qtmobility/
 
 
 %changelog
+* Fri Nov 06 2020 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.2.2-0.39.20140317git169da60c
+- Switch to bundled proj on F34+, proj 7 is not supported
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-0.38.20140317git169da60c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild