- updated to 6.0.0

diff --git a/digikam.spec b/digikam.spec
index 0eddb8f1c26eb6874db9590a27cb78e2ebd59eca..562dd6901566d7890c74c2f37b34ad5f7eb8c6ed 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,13 +5,12 @@
 Summary:       A KDE frontend for gphoto2
 Summary(pl.UTF-8):     Interfejs KDE do gphoto2
 Name:          digikam
-Version:       5.9.0
-Release:       4
+Version:       6.0.0
+Release:       1
 License:       GPL
 Group:         X11/Applications/Graphics
-Source0:       http://download.kde.org/stable/digikam/%{name}-%{version}.tar.xz
-# Source0-md5: 7811cc633e7e1770d1d9860fa36ea251
-Patch0:                exiv2-0.27.patch
+Source0:       http://download.kde.org/stable/digikam/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 7aa9a41b0ed101230b9db7efdf5b1db1
 URL:           http://www.digikam.org/
 BuildRequires: ImageMagick-devel
 BuildRequires: clapack-devel
@@ -80,7 +79,6 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
@@ -119,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
+%doc AUTHORS ChangeLog CODE_OF_CONDUCT.md COPYING* NEWS PACKAGING README.md README.DEVEL
 %attr(755,root,root) %{_bindir}/cleanup_digikamdb
 %attr(755,root,root) %{_bindir}/digikam
 %attr(755,root,root) %{_bindir}/digitaglinktree

diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch
deleted file mode 100644 (file)
index d8c73a9..0000000
--- a/exiv2-0.27.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- digikam-5.9.0/core/cmake/modules/FindExiv2.cmake~  2018-03-19 10:41:56.000000000 +0100
-+++ digikam-5.9.0/core/cmake/modules/FindExiv2.cmake   2019-02-11 22:51:15.308354934 +0100
-@@ -54,7 +54,7 @@
- 
- # Get the version number from exiv2/version.hpp and store it in the cache:
- if(EXIV2_INCLUDE_DIR  AND NOT  EXIV2_VERSION)
--  file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
-+  file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
-   string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)"  _dummy "${EXIV2_VERSION_CONTENT}")
-   set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
- 
---- digikam-5.9.0/core/libs/dmetadata/metaengine_p.h~  2018-03-19 10:41:58.000000000 +0100
-+++ digikam-5.9.0/core/libs/dmetadata/metaengine_p.h   2019-02-11 23:13:30.270882447 +0100
-@@ -70,6 +70,7 @@
- #include <exiv2/types.hpp>
- #include <exiv2/exif.hpp>
- #include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/version.hpp>
- 
- // Check if Exiv2 support XMP
- 
---- digikam-5.9.0/core/libs/dmetadata/metaengine_exif.cpp~     2018-03-19 10:41:58.000000000 +0100
-+++ digikam-5.9.0/core/libs/dmetadata/metaengine_exif.cpp      2019-02-11 23:16:52.323399768 +0100
-@@ -1007,7 +1007,11 @@
- 
-         if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
-         {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
-+#else
-             throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
-+#endif
-         }
- 
-         // Remove sub-IFD tags