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=23fe1565da....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 0599a3b025a9bd67cc3bb0820b65c1d6a28b8cb2
Merge: 23fe156 7e54fe2
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Jul 18 08:31:21 2020 -0500
Merge branch 'f32' into f31
commit 23fe1565daa39f13010389a980e1df0e87445e8b
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Jul 18 08:31:16 2020 -0500
Revert "Revert "digkam-7.0.0-beta1""
This reverts commit 1d351793b16019f91c93b6084ff925b407a4bbac.
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 7e54fe236863c06cd43dadada9495c578aadbaf8
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Jul 17 15:29:24 2020 -0500
digikam-7.0.0
diff --git a/.gitignore b/.gitignore
index b21825c..00c0adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/digikam-7.0.0-beta1.tar.xz
/digikam-7.0.0-beta2.tar.xz
/digikam-7.0.0-beta3.tar.xz
+/digikam-7.0.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index 26a91b9..d220514 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,16 +2,14 @@
# use ninja or not
%global ninja 1
-%global beta beta3
-
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.7.%{beta}%{?dist}
+Release: 1%{?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...
# rawhide s390x is borked recently
#ExcludeArch: s390x
@@ -258,6 +256,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Fri Jul 17 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-1
+- digikam-7.0.0
+
* Fri May 29 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-0.7.beta3
- rebuild (opencv)
diff --git a/sources b/sources
index 0dbceef..5f64be5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-7.0.0-beta3.tar.xz) =
da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
+SHA512 (digikam-7.0.0.tar.xz) =
379d319dddd49605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
commit f427c60e6fd3d84ea8a899f61694623558fe8dd0
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri May 29 12:50:45 2020 -0500
rebuild (opencv)
diff --git a/digikam.spec b/digikam.spec
index 8dcb738..26a91b9 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -7,7 +7,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.6.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Fri May 29 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-0.7.beta3
+- rebuild (opencv)
+
* Sat May 09 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-0.6.beta3
- bump opencv,ImageMagick deps
- make weak deps unconditional
commit ebaa350831954b1e5139fbaccad4273f28cdb4fe
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed May 27 10:13:01 2020 -0500
bump opencv,ImageMagick deps
make weak deps unconditional
diff --git a/digikam.spec b/digikam.spec
index 99f9583..8dcb738 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -7,7 +7,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -35,7 +35,8 @@ BuildRequires: doxygen
BuildRequires: extra-cmake-modules
BuildRequires: gettext
BuildRequires: gcc-c++
-BuildRequires: ImageMagick-devel ImageMagick-c++-devel
+BuildRequires: ImageMagick-devel
+BuildRequires: ImageMagick-c++-devel >= 6.7
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: marble-astro-devel
@@ -105,7 +106,7 @@ BuildRequires: pkgconfig(lqr-1)
BuildRequires: pkgconfig(libpgf) >= 6.12.24
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%if 0%{?fedora} > 21
+
Recommends: %{name}-doc = %{version}-%{release}
# expoblending assistant
Recommends: hugin-base
@@ -114,7 +115,6 @@ Recommends: hugin-base
Recommends: kio-extras
Recommends: qt5-qtbase-mysql%{?_isa}
Recommends: qt5-qtimageformats%{?_isa}
-%endif
# core/libs/rawengine/libraw/
Provides: bundled(LibRaw) = 0.18.5
@@ -258,6 +258,10 @@ update-desktop-database -q &> /dev/null
%changelog
+* Sat May 09 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-0.6.beta3
+- bump opencv,ImageMagick deps
+- make weak deps unconditional
+
* Mon Apr 27 2020 Rex Dieter <rdieter(a)fedoraproject.org> 7.0.0-0.5.beta3
- 7.0.0-beta3
commit 34f36449bed8c1b24407199d863326e714139f04
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat May 9 11:09:07 2020 -0500
bump opencv dep
diff --git a/digikam.spec b/digikam.spec
index f5c95c4..99f9583 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -94,7 +94,7 @@ BuildRequires: expat-devel
## htmlexport plugin
BuildRequires: pkgconfig(libxslt)
## RemoveRedeye
-BuildRequires: pkgconfig(opencv) >= 3.1
+BuildRequires: pkgconfig(opencv) >= 3.3
# Panorama plugin requires flex and bison
BuildRequires: flex
BuildRequires: bison
commit 4d1869843a582c990d21085aa73807074c9c10b7
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Apr 28 14:36:43 2020 -0500
explicitly set -DENABLE_QWEBENGINE ON/OFF
diff --git a/digikam.spec b/digikam.spec
index 5f3b4b2..f5c95c4 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -57,7 +57,7 @@ BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(x11) pkgconfig(xproto)
%if 0%{?qt5_qtwebengine_arches:1}
%ifarch %{?qt5_qtwebengine_arches}
-%global qwebengine -DENABLE_QWEBENGINE:BOOL=ON
+%global qwebengine 1
BuildRequires: cmake(KF5AkonadiContact)
BuildRequires: pkgconfig(Qt5WebEngine)
%else
@@ -163,7 +163,7 @@ pushd %{_target_platform}
-DENABLE_MEDIAPLAYER:BOOL=OFF \
-DENABLE_MYSQLSUPPORT:BOOL=ON \
-DENABLE_INTERNALMYSQL:BOOL=ON \
- %{?qwebengine}
+ -DENABLE_QWEBENGINE:BOOL=%{?qwebengine:ON}%{!?qwebengine:OFF}
popd
%if 0%{?ninja}
commit 90e5fbc03ba5e0c3870ed78e2ff4e4956f0a9775
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Apr 27 11:52:28 2020 -0500
7.0.0-beta3
diff --git a/.gitignore b/.gitignore
index e18b886..b21825c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/digikam-6.4.0.tar.xz
/digikam-7.0.0-beta1.tar.xz
/digikam-7.0.0-beta2.tar.xz
+/digikam-7.0.0-beta3.tar.xz
diff --git a/digikam.spec b/digikam.spec
index 65e8922..5f3b4b2 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,12 +2,12 @@
# use ninja or not
%global ninja 1
-%global beta beta2
+%global beta beta3
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.4.%{beta}%{?dist}
+Release: 0.5.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Apr 27 2020 Rex Dieter <rdieter(a)fedoraproject.org> 7.0.0-0.5.beta3
+- 7.0.0-beta3
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.0-0.4.beta2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 54819d2..0dbceef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-7.0.0-beta2.tar.xz) =
ca0e6896919a6c61446e46f5ceed27b7d3a0ab60ea57eb1721ab3471c17982c01e10f6d5d4e1b49b5f1868b4241843440e3e63daf85cfc076cd3ddf10d582b51
+SHA512 (digikam-7.0.0-beta3.tar.xz) =
da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
commit 3f5360ad2067ce86c37c50179e210074a864ef66
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 15:52:03 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/digikam.spec b/digikam.spec
index 294337a..65e8922 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -7,7 +7,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.0-0.4.beta2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Tue Jan 28 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.0-0.3.beta2
- Rebuild for OpenCV 4.2
commit e7e326f35ccca0b9d0e1b6739aed48229884f371
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 28 11:12:41 2020 +0100
Rebuilt
diff --git a/digikam.spec b/digikam.spec
index 4615e75..294337a 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -7,7 +7,7 @@
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Tue Jan 28 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.0-0.3.beta2
+- Rebuild for OpenCV 4.2
+
* Mon Jan 27 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.0-0.2.beta2
- Update to beta2
commit a47be347ccbf94fd74d46f7280a954edb70a53a8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jan 27 16:19:09 2020 +0100
Update to beta2
diff --git a/.gitignore b/.gitignore
index 137dcd8..e18b886 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/digikam-6.3.0.tar.xz
/digikam-6.4.0.tar.xz
/digikam-7.0.0-beta1.tar.xz
+/digikam-7.0.0-beta2.tar.xz
diff --git a/digikam.spec b/digikam.spec
index d9ba1db..4615e75 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -2,12 +2,12 @@
# use ninja or not
%global ninja 1
-%global beta beta1
+%global beta beta2
Name: digikam
Summary: A digital camera accessing & photo management application
Version: 7.0.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
License: GPLv2+
URL:
http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Jan 27 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 7.0.0-0.2.beta2
+- Update to beta2
+
* Tue Dec 31 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 7.0.0-0.1.beta1
- digkam-7.0.0-beta1
- use ninja
diff --git a/sources b/sources
index ee058cd..54819d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digikam-7.0.0-beta1.tar.xz) =
16a2ff838a0a2a238ca0791697cf64d15d03b54dadb6941bd02079ad74bf8e62a710eb03588fd06f8893a46cae0c296350190d0a88692b24999ce3333064cd3c
+SHA512 (digikam-7.0.0-beta2.tar.xz) =
ca0e6896919a6c61446e46f5ceed27b7d3a0ab60ea57eb1721ab3471c17982c01e10f6d5d4e1b49b5f1868b4241843440e3e63daf85cfc076cd3ddf10d582b51