From 92e52b815b5d100c5247b9f1320286d665f498a2982b0a2800cfa0887b83a0e0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 9 Feb 2018 14:51:52 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 168.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=d4373f34458e9c500918cf8d357dd4be --- ...ble-detection-of-OpenGL-for-GLES-platforms.patch | 2 +- digikam.changes | 13 +++++++++++++ digikam.spec | 5 +---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch b/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch index 40092e9..fc02c70 100644 --- a/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch +++ b/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. diff --git a/digikam.changes b/digikam.changes index 26d682b..1c0052d 100644 --- a/digikam.changes +++ b/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 diff --git a/digikam.spec b/digikam.spec index 744c1d5..a77d9f1 100644 --- a/digikam.spec +++ b/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