Accepting request 525901 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/525901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=161

digikam-5.6.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65bdd3f15668e314b852d523a0bf95da32450f31fcfda60da62e57d4622a663c
-size 166913492

digikam-5.7.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5
+size 123315064

digikam.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Sep 12 12:29:53 UTC 2017 - wbauer@tmo.at
+
+- Update to 5.7.0:
+  * https://www.digikam.org/news/2017-09-11-5.7.0_release_announcement/
+- New features (from NEWS):
+General     : Add online handbook reader not dependant of desktop.
+General     : New tool to export albums by email.
+General     : New tool to create advance print layout.
+General     : Send by Mail tool can remove all metadata to attached items.
+General     : Replaced the minimum and maximum similarity selection boxes in fuzzy
+              search, duplicates search and maintenance by a new, generic DIntRangeBox
+              which makes the look, feel and behavious consistent in all places.
+              Also, this makes redundant code obsolete and reduces the probability of bugs.
+PrintCreator: Add option to create printing from albums or images selection.
+PrintCreator: Add option to customize output image properties to render printing.
+PrintCreator: Tool is now multi-threaded to process images while preview and printing.
+ImageEditor : Add SendByMail and PrintCreator tools support.
+Showfoto    : Add SendByMail and PrintCreator tools support.
+LightTable  : Add SendByMail and PrintCreator tools support.
+Panorama    : Add Hugin 2017.0 support.
+Geolocation : Add new tool to export GPS trace to KML file from geolocation editor.
+
+- Many bugs fixed
+- Drop fix-build-cmake39.patch, now upstream
+- Drop find_libastro-qt5.patch, 42.1 is no longer supported and
+  its Qt5 is too old anyway
+- Drop unneeded exiv2 requirement, digikam uses libexiv2 only
+- Add libkvkontakte-devel and libmediawiki-devel build requirements
+  (both have been released as KF5 versions meanwhile) to enable the
+  corresponding kipi plugins
+- Build with opencv-devel instead of opencv-qt5-devel, the latter
+  doesn't exist any more
+  
 -------------------------------------------------------------------
 Sat Aug 26 09:16:31 UTC 2017 - fabian@ritter-vogt.de
 

digikam.spec

@@ -17,17 +17,13 @@
 
 
 Name:           digikam
-Version:        5.6.0
+Version:        5.7.0
 Release:        0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Viewers
 Url:            http://www.digikam.org/
 Source0:        http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1
-Patch0:         find_libastro-qt5.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         fix-build-cmake39.patch
 #This pulls in QWebEngine, which is not available on ppc64
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
@@ -48,7 +44,7 @@ BuildRequires:  knotifyconfig-devel
 BuildRequires:  lensfun
 BuildRequires:  lensfun-devel
 BuildRequires:  libeigen3-devel
-BuildRequires:  libexiv2-devel
+BuildRequires:  libexiv2-devel >= 0.26
 BuildRequires:  libexpat-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgphoto2-devel >= 2.4.0
@@ -63,8 +59,10 @@ BuildRequires:  libkface-devel >= 15.12.0
 BuildRequires:  libkgeomap-devel > 15.12.0
 BuildRequires:  libkipi-devel >= 16.04.0
 BuildRequires:  libksane-devel >= 15.12.0
+BuildRequires:  libkvkontakte-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  liblqr-devel
+BuildRequires:  libmediawiki-devel
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libmysqld-devel
 BuildRequires:  libpgf-devel
@@ -73,7 +71,7 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libusb-devel
 BuildRequires:  marble-devel
 BuildRequires:  mysql
-BuildRequires:  opencv-qt5-devel
+BuildRequires:  opencv-devel
 BuildRequires:  threadweaver-devel >= 5.1.0
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
@@ -92,7 +90,6 @@ Requires:       kipi-plugins >= %{version}
 Recommends:     %{name}-doc
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       exiv2 >= 0.25
 Recommends:     marble
 Recommends:     showfoto
 # Got merged into libimageeditor in 5.2.0
@@ -167,13 +164,6 @@ The main digikam libraries that are being shared between showfoto and digikam
 
 %prep
 %setup -q -n %{name}-%{version}
-%if 0%{?is_opensuse} && 0%{?sle_version} == 120100
-# we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it
-%patch0 -p1
-%endif
-pushd core
-%patch1 -p1
-popd
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -184,7 +174,6 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" core/libs/dimg/filters/greycstoration/
 sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/cimg/CImg.h
 
 # Workaround for kde#369517 - vkontakte installs translations even if not built
-rm -f po/*/kipiplugin_vkontakte.po
 rm -f po/*/libkvkontakte.po
 
 %build
@@ -219,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test
 %find_lang %{name}
 %find_lang kipiplugins kipiplugin.lang
 
-for i in dropbox googleservices sendimages facebook flashexport flickr imageshack imgur kmlexport piwigo printimages rajce remotestorage sendimages smug  yandexfotki
+for i in dropbox googleservices sendimages facebook flashexport flickr imageshack imgur kmlexport piwigo printimages rajce remotestorage sendimages smug vkontakte yandexfotki
 do
   %find_lang kipiplugin_$i kipiplugin.lang
 done
@@ -250,8 +239,6 @@ done
 %_datadir/solid/actions/digikam-opencamera.desktop
 %_datadir/kxmlgui5/digikam/
 %_datadir/knotifications5/digikam.notifyrc
-# For Leap 42.1
-%dir %{_kf5_appstreamdir}
 %{_kf5_appstreamdir}/org.kde.digikam.appdata.xml
 %_kf5_iconsdir/hicolor/*/apps/panorama.*
 
@@ -262,8 +249,6 @@ done
 %_kf5_iconsdir/hicolor/*/apps/showfoto.*
 %_datadir/showfoto/
 %_datadir/kxmlgui5/showfoto/
-# For Leap 42.1
-%dir %{_kf5_appstreamdir}
 %{_kf5_appstreamdir}/org.kde.showfoto.appdata.xml
 
 %files -n libdigikamcore5

find_libastro-qt5.patch

@@ -1,12 +0,0 @@
-diff -urB digikam/core/cmake/modules/FindMarble.cmake new/core/cmake/modules/FindMarble.cmake
---- digikam/core/cmake/modules/FindMarble.cmake	2015-10-17 08:33:01.347270719 +0200
-+++ new/core/cmake/modules/FindMarble.cmake	2015-10-17 12:07:56.423127921 +0200
-@@ -19,7 +19,7 @@
- 
- FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h )
- FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget-qt5 marblewidget-qt5d )
--FIND_LIBRARY( ASTRO_LIBRARIES NAMES astro astrod )
-+FIND_LIBRARY( ASTRO_LIBRARIES NAMES astro-qt5 astro-qt5d )
- 
- INCLUDE( FindPackageHandleStandardArgs )
-