From c50e0c0d07dcc3f996ab4d9ff9dce7d01c77d85c64268abfd2436be5c01a858c Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 14 Jun 2020 14:43:19 +0000
Subject: [PATCH] 2.9.1

OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=45
---
 gmic.changes      |  7 +++++++
 gmic.spec         | 37 +++++++++++++++++++++++++------------
 gmic_2.9.0.tar.gz |  3 ---
 gmic_2.9.1.tar.gz |  3 +++
 4 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 gmic_2.9.0.tar.gz
 create mode 100644 gmic_2.9.1.tar.gz

diff --git a/gmic.changes b/gmic.changes
index b101ff5..93fe7ef 100644
--- a/gmic.changes
+++ b/gmic.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jun 14 09:25:43 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 2.9.1. No changelog.
+- Add patch to allow building gmic with older CMake versions:
+  * 0001-Don-t-use-CMake-commands-not-available-in-CMake-3.9.patch
+
 -------------------------------------------------------------------
 Sat Mar 28 19:04:56 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/gmic.spec b/gmic.spec
index 9d36bba..261023e 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -38,7 +38,7 @@
 %bcond_with opencv
 %endif
 Name:           gmic
-Version:        2.9.0
+Version:        2.9.1
 Release:        0
 Summary:        GREYC's Magick for Image Computing (denoise and others)
 # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are
@@ -49,7 +49,9 @@ URL:            https://gmic.eu
 # Git URL:      https://framagit.org/dtschump/gmic
 Source0:        https://gmic.eu/files/source/gmic_%{version}.tar.gz
 Source1:        gmic_qt.png
-BuildRequires:  cmake > 3.8
+# PATCH-FIX-UPSTREAM
+Patch:          0001-Don-t-use-CMake-commands-not-available-in-CMake-3.9.patch
+BuildRequires:  cmake >= 3.9.4
 BuildRequires:  fftw3-threads-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
@@ -72,12 +74,12 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(zlib)
 %if %{with opencv}
-# in openSUSE >= 15.2, opencv-devel is opencv4 and pkgconfig(opencv) is opencv3
-# ...and opencv3-devel doesn't exist in leap 15.0 and 15.1
-%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
-BuildRequires:  opencv-devel
-%else
+# gmic first looks for opencv 4 first and falls back to opencv 3 if not found.
+# opencv in not available in leap <= 15.2
+%if 0%{?suse_version} <= 1500
 BuildRequires:  pkgconfig(opencv)
+%else
+BuildRequires:  pkgconfig(opencv4)
 %endif
 %endif
 
@@ -150,16 +152,23 @@ the G'MIC image processing language by offering the choice of several
 manipulations on a video stream acquired from a webcam. In other words, ZArt is
 a GUI for G'MIC real-time manipulations on the output of a webcam.
 
+%package bash-completion
+Summary:        Bash completion for gmic
+License:        CECILL-2.1
+Group:          Productivity/Graphics/Bitmap Editors
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+
+%description bash-completion
+This package contain de bash completion command for gmic.
+
 %prep
-%setup -q
+%autosetup -p1
+
 # Generated file that should not be there
 rm -f zart/.qmake.stash
 
 %build
-
-# Leap 15.0 doesn't know %%cmake_build
-%{?!cmake_build:%define cmake_build() make %{?_smp_mflags} VERBOSE=1}
-
 # Build gmic
 %cmake \
     -DENABLE_DYNAMIC_LINKING=ON \
@@ -308,4 +317,8 @@ popd
 %{_libdir}/libgmic.so
 %{_libdir}/cmake/gmic/
 
+%files bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/gmic
+
 %changelog
diff --git a/gmic_2.9.0.tar.gz b/gmic_2.9.0.tar.gz
deleted file mode 100644
index 5e37b02..0000000
--- a/gmic_2.9.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5
-size 6195597
diff --git a/gmic_2.9.1.tar.gz b/gmic_2.9.1.tar.gz
new file mode 100644
index 0000000..a2acc86
--- /dev/null
+++ b/gmic_2.9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50c9dd418b8d0e80c703c2e2b179b6049343567483d37d9ff6c642c6ede95d8d
+size 6212626