The package rpms/digikam.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=1d351793b1...
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=cb2658e5bb....
Change:
+ExcludeArch: s390x
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 1d351793b16019f91c93b6084ff925b407a4bbac
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jan 6 09:30:28 2020 -0600
Revert "digkam-7.0.0-beta1"
This reverts commit cb2658e5bb8e59398fa48ab2a238cbab1398d239.
diff --git a/.gitignore b/.gitignore
index 137dcd8..e3ea977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
/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
new file mode 100644
index 0000000..bea5c4c
--- /dev/null
+++ b/digikam-6.4.0-Wall.patch
@@ -0,0 +1,12 @@
+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 d9ba1db..6a22506 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,20 +1,24 @@
# use ninja or not
-%global ninja 1
-
-%global beta beta1
+#global ninja 1
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 7.0.0
-Release: 0.1.%{beta}%{?dist}
+Version: 6.4.0
+Release: 2%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
-Source0:
http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{?be...
+Source0:
http://download.kde.org/%{?beta:un}stable/digikam/%{version}/digikam-%{ve...
+
+# workaround ppc64le FTBFS
+#
https://bugs.kde.org/show_bug.cgi?id=404853
+%ifarch ppc64le
+%global facesengine -DENABLE_FACESENGINE_DNN:BOOL=OFF
+%endif
# rawhide s390x is borked recently
-#ExcludeArch: s390x
+ExcludeArch: s390x
# digiKam not listed as a media handler for pictures in Nautilus (#516447)
# TODO: upstream me
@@ -23,6 +27,7 @@ Source10: digikam-import.desktop
## upstream patches
## upstreamable patches
+Patch100: digikam-6.4.0-Wall.patch
%if 0%{?ninja}
BuildRequires: ninja-build
@@ -41,7 +46,7 @@ BuildRequires: libtiff-devel
BuildRequires: marble-astro-devel
BuildRequires: marble-widget-qt5-devel
BuildRequires: perl-generators
-BuildRequires: pkgconfig(exiv2) >= 0.26
+BuildRequires: pkgconfig(exiv2) >= 0.25
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(jasper)
BuildRequires: pkgconfig(lcms2)
@@ -151,6 +156,11 @@ 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}
@@ -163,6 +173,7 @@ pushd %{_target_platform}
-DENABLE_MEDIAPLAYER:BOOL=OFF \
-DENABLE_MYSQLSUPPORT:BOOL=ON \
-DENABLE_INTERNALMYSQL:BOOL=ON \
+ %{?facesengine} \
%{?qwebengine}
popd
@@ -258,11 +269,6 @@ update-desktop-database -q &> /dev/null
%changelog
-* Tue Dec 31 2019 Rex Dieter <rdieter(a)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(a)gmail.com> - 6.4.0-2
- Rebuilt for opencv4
diff --git a/sources b/sources
index ee058cd..2f52165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-7.0.0-beta1.tar.xz) =
16a2ff838a0a2a238ca0791697cf64d15d03b54dadb6941bd02079ad74bf8e62a710eb03588fd06f8893a46cae0c296350190d0a88692b24999ce3333064cd3c
+SHA512 (digikam-6.4.0.tar.xz) =
952ecb8c1a4f5477afd7b388df6be803482540fe9e4c4bc5011929f2cf0b4225396f2e940cbba2a45208f069deda1a8352a6841a4162b1099805c1cc60bd7c73
commit cb2658e5bb8e59398fa48ab2a238cbab1398d239
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Dec 31 14:09:46 2019 -0600
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-%{ve...
-
-# 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}%{?be...
# 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(a)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(a)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
commit c858e105c1c66c0dd57777a7acc5c381395ba3b7
Author: kwizart <kwizart(a)gmail.com>
Date: Sun Dec 29 11:20:47 2019 +0100
Rebuilt for opencv4
diff --git a/digikam.spec b/digikam.spec
index bab5bf3..6a22506 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,7 +5,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 6.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -269,6 +269,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Sun Dec 29 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 6.4.0-2
+- Rebuilt for opencv4
+
* Tue Nov 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.4.0-1
- digikam-6.4.0
commit 312cd3f5900d3932c02bae6355af569d2ce92022
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Nov 12 12:52:28 2019 -0600
digikam-6.4.0
diff --git a/.gitignore b/.gitignore
index 5d9e147..e3ea977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/digikam-6.2.0.tar.xz
/digikam-6.3.0.tar.xz
+/digikam-6.4.0.tar.xz
diff --git a/digikam-6.2.0-Wall.patch b/digikam-6.2.0-Wall.patch
deleted file mode 100644
index ef4e22c..0000000
--- a/digikam-6.2.0-Wall.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up digikam-6.2.0/core/libs/facesengine/CMakeLists.txt.Wall
digikam-6.2.0/core/libs/facesengine/CMakeLists.txt
---- digikam-6.2.0/core/libs/facesengine/CMakeLists.txt.Wall 2019-07-31 11:12:57.000000000
-0500
-+++ digikam-6.2.0/core/libs/facesengine/CMakeLists.txt 2019-08-03 09:56:28.694088905
-0500
-@@ -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("4.99.99"
"-Wno-cast-align")
- DISABLE_CLANG_COMPILER_WARNINGS("4.99.99"
"-Wno-sign-compare")
diff --git a/digikam-6.4.0-Wall.patch b/digikam-6.4.0-Wall.patch
new file mode 100644
index 0000000..bea5c4c
--- /dev/null
+++ b/digikam-6.4.0-Wall.patch
@@ -0,0 +1,12 @@
+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 8f48dee..bab5bf3 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -4,7 +4,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 6.3.0
+Version: 6.4.0
Release: 1%{?dist}
License: GPLv2+
@@ -27,7 +27,7 @@ Source10: digikam-import.desktop
## upstream patches
## upstreamable patches
-Patch100: digikam-6.2.0-Wall.patch
+Patch100: digikam-6.4.0-Wall.patch
%if 0%{?ninja}
BuildRequires: ninja-build
@@ -269,6 +269,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Nov 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.4.0-1
+- digikam-6.4.0
+
* Tue Sep 17 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.3.0-1
- digikam-6.3.0
diff --git a/sources b/sources
index 2b0fd2b..2f52165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-6.3.0.tar.xz) =
9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
+SHA512 (digikam-6.4.0.tar.xz) =
952ecb8c1a4f5477afd7b388df6be803482540fe9e4c4bc5011929f2cf0b4225396f2e940cbba2a45208f069deda1a8352a6841a4162b1099805c1cc60bd7c73
commit 972ee8f5e7c028c5963ecb4db20130f4b9d94238
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 17 11:24:19 2019 -0500
update %%files
cmake files changed paths
diff --git a/digikam.spec b/digikam.spec
index aa9da1f..8f48dee 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -264,7 +264,7 @@ update-desktop-database -q &> /dev/null
%{_kf5_libdir}/libdigikamcore.so
%{_kf5_libdir}/libdigikamdatabase.so
%{_kf5_libdir}/libdigikamgui.so
-%{_kf5_libdir}/cmake/digikam/
+%{_kf5_libdir}/cmake/Digikam*/
%{_includedir}/digikam/
commit aeda55d7f4fd80271c3cc2ec8d78a8889191a209
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Sep 17 07:29:29 2019 -0500
digikam-6.3.0
diff --git a/.gitignore b/.gitignore
index 0ed6aa4..5d9e147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/digikam-6.2.0.tar.xz
+/digikam-6.3.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index 4cede31..aa9da1f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -4,7 +4,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
-Version: 6.2.0
+Version: 6.3.0
Release: 1%{?dist}
License: GPLv2+
@@ -269,6 +269,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Sep 17 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.3.0-1
+- digikam-6.3.0
+
* Wed Jul 31 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 6.2.0-1
- digikam-6.2.0
diff --git a/sources b/sources
index 2a9aa72..2b0fd2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-6.2.0.tar.xz) =
05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
+SHA512 (digikam-6.3.0.tar.xz) =
9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce