Accepting request 574411 from KDE:Extra

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

0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch

@@ -21,7 +21,7 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
 index cd482ea..bc3772b 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
-@@ -278,7 +278,7 @@ find_package(Marble)
+@@ -290,7 +290,7 @@ find_package(Marble)
  find_package(PkgConfig)
  find_package(Jasper)
  find_package(Eigen3)                               # For Refocus tool.

digikam.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Feb  8 13:19:01 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Drop xorg-x11-devel BuildRequires, all x11 dependencies are
+  via Qt and covered by the Qt5* BuildRequires
+- Drop BuildRequires on gphoto binary, the version is discovered
+  using pkgconfig now.
+
+-------------------------------------------------------------------
+Thu Feb  8 13:08:46 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Rebase 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
+
 -------------------------------------------------------------------
 Thu Jan 18 23:17:51 UTC 2018 - nico.kruber@gmail.com
 

digikam.spec

@@ -65,10 +65,7 @@ BuildRequires:  libeigen3-devel
 BuildRequires:  libexiv2-devel >= 0.26
 BuildRequires:  libexpat-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libgphoto2-devel >= 2.4.0
-# It invokes "gphoto2" for determining the API version
 BuildRequires:  QtAV-devel >= 1.11
-BuildRequires:  gphoto
 BuildRequires:  libgpod-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libkdcraw-devel >= 15.12.0
@@ -91,7 +88,6 @@ BuildRequires:  mysql
 BuildRequires:  opencv-devel
 BuildRequires:  threadweaver-devel >= 5.1.0
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
 BuildRequires:  cmake(KF5CalendarCore)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core) >= 5.6.0
@@ -102,6 +98,7 @@ BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(libgphoto2) >= 2.4.0
 Requires:       kipi-plugins >= %{version}
 Recommends:     %{name}-doc
 Recommends:     %{name}-lang