From cb2658e5bb8e59398fa48ab2a238cbab1398d239 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Dec 31 2019 20:13:18 +0000
Subject: digkam-7.0.0-beta1

use ninja
(re)enable s390x arch

---

diff --git a/.gitignore b/.gitignore
index e3ea977..137dcd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /digikam-6.2.0.tar.xz
 /digikam-6.3.0.tar.xz
 /digikam-6.4.0.tar.xz
+/digikam-7.0.0-beta1.tar.xz
diff --git a/digikam-6.4.0-Wall.patch b/digikam-6.4.0-Wall.patch
deleted file mode 100644
index bea5c4c..0000000
--- a/digikam-6.4.0-Wall.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up digikam-6.4.0/core/libs/facesengine/CMakeLists.txt.Wall digikam-6.4.0/core/libs/facesengine/CMakeLists.txt
---- digikam-6.4.0/core/libs/facesengine/CMakeLists.txt.Wall	2019-11-12 11:11:38.095373895 -0600
-+++ digikam-6.4.0/core/libs/facesengine/CMakeLists.txt	2019-11-12 11:12:18.213526994 -0600
-@@ -95,7 +95,7 @@ if(ENABLE_FACESENGINE_DNN)
-         # Dlib DNN generate plenty of wrong warnings. Remove these workaround later when code will be ported to OpenCV DNN.
-         REMOVE_GCC_COMPILER_WARNINGS("-Wextra")
-         REMOVE_GCC_COMPILER_WARNINGS("-Wundef")
--        REMOVE_GCC_COMPILER_WARNINGS("-Wall")
-+        #REMOVE_GCC_COMPILER_WARNINGS("-Wall")
- 
-         DISABLE_CLANG_COMPILER_WARNINGS("3.99.99" "-Wno-cast-align")
-         DISABLE_CLANG_COMPILER_WARNINGS("3.99.99" "-Wno-sign-compare")
diff --git a/digikam.spec b/digikam.spec
index 6a22506..d9ba1db 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,24 +1,20 @@
 
 # use ninja or not
-#global ninja 1
+%global ninja 1
+
+%global beta beta1
 
 Name:    digikam
 Summary: A digital camera accessing & photo management application
-Version: 6.4.0
-Release: 2%{?dist}
+Version: 7.0.0
+Release: 0.1.%{beta}%{?dist}
 
 License: GPLv2+
 URL:     http://www.digikam.org/
-Source0: http://download.kde.org/%{?beta:un}stable/digikam/%{version}/digikam-%{version}%{?beta:-%{beta}}.tar.xz
-
-# workaround ppc64le FTBFS
-# https://bugs.kde.org/show_bug.cgi?id=404853
-%ifarch ppc64le
-%global facesengine -DENABLE_FACESENGINE_DNN:BOOL=OFF
-%endif
+Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.xz
 
 # rawhide s390x is borked recently
-ExcludeArch: s390x
+#ExcludeArch: s390x
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
 # TODO: upstream me
@@ -27,7 +23,6 @@ Source10: digikam-import.desktop
 ## upstream patches
 
 ## upstreamable patches
-Patch100: digikam-6.4.0-Wall.patch
 
 %if 0%{?ninja}
 BuildRequires: ninja-build
@@ -46,7 +41,7 @@ BuildRequires: libtiff-devel
 BuildRequires: marble-astro-devel
 BuildRequires: marble-widget-qt5-devel
 BuildRequires: perl-generators
-BuildRequires: pkgconfig(exiv2) >= 0.25
+BuildRequires: pkgconfig(exiv2) >= 0.26
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(jasper)
 BuildRequires: pkgconfig(lcms2)
@@ -156,11 +151,6 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-# EVIV2_MIN_VERSION
-sed -i -e "s|0.26|0.25|g" core/CMakeLists.txt
-
-%patch100 -p1 -b .Wall
-
 
 %build
 mkdir %{_target_platform}
@@ -173,7 +163,6 @@ pushd %{_target_platform}
   -DENABLE_MEDIAPLAYER:BOOL=OFF \
   -DENABLE_MYSQLSUPPORT:BOOL=ON \
   -DENABLE_INTERNALMYSQL:BOOL=ON \
-  %{?facesengine} \
   %{?qwebengine}
 popd
 
@@ -269,6 +258,11 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Tue Dec 31 2019 Rex Dieter <rdieter@fedoraproject.org> - 7.0.0-0.1.beta1
+- digkam-7.0.0-beta1
+- use ninja
+- (re)enable s390x arch
+
 * Sun Dec 29 2019 Nicolas Chauvet <kwizart@gmail.com> - 6.4.0-2
 - Rebuilt for opencv4
 
diff --git a/sources b/sources
index 2f52165..ee058cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-6.4.0.tar.xz) = 952ecb8c1a4f5477afd7b388df6be803482540fe9e4c4bc5011929f2cf0b4225396f2e940cbba2a45208f069deda1a8352a6841a4162b1099805c1cc60bd7c73
+SHA512 (digikam-7.0.0-beta1.tar.xz) = 16a2ff838a0a2a238ca0791697cf64d15d03b54dadb6941bd02079ad74bf8e62a710eb03588fd06f8893a46cae0c296350190d0a88692b24999ce3333064cd3c