From bb59d2675e965b67d8948897c33d0068463721bc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Aug 23 2020 17:47:07 +0000
Subject: 20.08.0


---

diff --git a/.gitignore b/.gitignore
index 80f7d33..f0a9111 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1 @@
-/konqueror-17.12.3.tar.xz
-/konqueror-18.04.0.tar.xz
-/konqueror-18.04.1.tar.xz
-/konqueror-18.04.2.tar.xz
-/konqueror-18.04.3.tar.xz
-/konqueror-18.08.0.tar.xz
-/konqueror-18.08.1.tar.xz
-/konqueror-18.08.2.tar.xz
-/konqueror-18.08.3.tar.xz
-/konqueror-18.12.0.tar.xz
-/konqueror-18.12.2.tar.xz
-/konqueror-18.12.3.tar.xz
-/konqueror-19.04.1.tar.xz
-/konqueror-19.04.2.tar.xz
-/konqueror-19.04.3.tar.xz
-/konqueror-19.08.0.tar.xz
-/konqueror-19.08.1.tar.xz
-/konqueror-19.08.2.tar.xz
-/konqueror-19.08.3.tar.xz
-/konqueror-19.12.1.tar.xz
-/konqueror-19.12.2.tar.xz
-/konqueror-19.12.3.tar.xz
-/konqueror-20.04.0.tar.xz
-/konqueror-20.04.1.tar.xz
-/konqueror-20.04.2.tar.xz
-/konqueror-20.04.3.tar.xz
+/konqueror-20.08.0.tar.xz
diff --git a/konqueror-webengine_optional.patch b/konqueror-webengine_optional.patch
index 60ad9a8..95fe0eb 100644
--- a/konqueror-webengine_optional.patch
+++ b/konqueror-webengine_optional.patch
@@ -1,17 +1,18 @@
-diff -up konqueror-20.04.0/CMakeLists.txt.webengine_optional konqueror-20.04.0/CMakeLists.txt
---- konqueror-20.04.0/CMakeLists.txt.webengine_optional	2020-04-16 19:18:40.000000000 -0500
-+++ konqueror-20.04.0/CMakeLists.txt	2020-04-23 08:07:19.301843600 -0500
-@@ -23,7 +23,8 @@ include(CMakePackageConfigHelpers)
- set(KONQUEROR_LIB_VERSION "5.0.97")
+diff -up konqueror-20.08.0/CMakeLists.txt.100 konqueror-20.08.0/CMakeLists.txt
+--- konqueror-20.08.0/CMakeLists.txt.100	2020-08-23 12:43:31.787077920 -0500
++++ konqueror-20.08.0/CMakeLists.txt	2020-08-23 12:45:07.942943470 -0500
+@@ -29,7 +29,9 @@ include(CMakePackageConfigHelpers)
+ set(KONQUEROR_LIB_VERSION "${RELEASE_SERVICE_VERSION}")
  set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
  
 -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
 +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets)
 +find_package(Qt5WebEngineWidgets)
++
  find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils Archive Crash WindowSystem Init IconThemes DBusAddons)
  find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KDELibs4Support)
  
-@@ -60,7 +61,9 @@ add_subdirectory( client )
+@@ -66,7 +68,9 @@ add_subdirectory( client )
  if(BUILD_TESTING)
      add_subdirectory( autotests )
  endif()
@@ -20,4 +21,4 @@ diff -up konqueror-20.04.0/CMakeLists.txt.webengine_optional konqueror-20.04.0/C
 +endif()
  
  add_subdirectory( pics )
- #add_subdirectory( sidebar )
+ add_subdirectory( sidebar )
diff --git a/konqueror.spec b/konqueror.spec
index c9d38c9..93fd093 100644
--- a/konqueror.spec
+++ b/konqueror.spec
@@ -12,8 +12,8 @@
 #global tests 1
 
 Name:    konqueror
-Version: 20.04.3
-Release: 2%{?dist}
+Version: 20.08.0
+Release: 1%{?dist}
 Summary: KDE File Manager and Browser
 
 License: GPLv2+ and LGPLv2+ and GFDL
@@ -45,7 +45,7 @@ Patch200: konqueror-18.12.0-webenginepart_priority.patch
 
 BuildRequires: desktop-file-utils
 
-BuildRequires: extra-cmake-modules
+BuildRequires: extra-cmake-modules >= 5.71
 BuildRequires: cmake(KDED)
 BuildRequires: cmake(KF5Activities)
 BuildRequires: cmake(KF5Archive)
@@ -131,10 +131,11 @@ browsing the web in Konqueror.
 
 
 %build
-%{cmake_kf5} \
+%cmake_kf5 \
   -Wno-dev \
   %{?ninja:-G Ninja} \
   %{?tests:-DBUILD_TESTING:BOOL=ON}
+
 %cmake_build
 
 
@@ -219,6 +220,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 
 
 %changelog
+* Mon Aug 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.0-1
+- 20.08.0
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.04.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index bcb19c7..4ac040c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (konqueror-20.04.3.tar.xz) = b9763e99e6b0703a704575174f80745e607effbac1d615031dc184d9d2af7d2dcb1161a6f5277baef285c04a0e36a88da1fbd802aa5e00b99c1367ae53cb18b6
+SHA512 (konqueror-20.08.0.tar.xz) = 0a25d21a98f15bfd06db749ddb4a45b1e47f1de125176bc808b053682850c9826736fea1ca0f82c8d01dfacd4890fbc320a7c8b8921472f7d5a6327b8ec0a8c3