From 2957186ff074982e823a9cff9194f748039d2f326ba7b9713f70d22eebdea0d0 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 12 Apr 2021 14:55:46 +0000
Subject: [PATCH] Accepting request 884699 from home:cgiboudeaux:graphics

- Update to 2.9.7. No changelog.

OBS-URL: https://build.opensuse.org/request/show/884699
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=59
---
 gmic.changes      |  5 +++++
 gmic.spec         | 21 ++++++---------------
 gmic_2.9.6.tar.gz |  3 ---
 gmic_2.9.7.tar.gz |  3 +++
 4 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 gmic_2.9.6.tar.gz
 create mode 100644 gmic_2.9.7.tar.gz

diff --git a/gmic.changes b/gmic.changes
index 5774e07..c584777 100644
--- a/gmic.changes
+++ b/gmic.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 12 09:49:02 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 2.9.7. No changelog.
+
 -------------------------------------------------------------------
 Wed Feb 10 17:06:54 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/gmic.spec b/gmic.spec
index a506af7..d68e52f 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -26,14 +26,8 @@
 %define _lto_cflags %{nil}
 
 %global _gimpplugindir %(gimptool-2.0 --gimpplugindir)/plug-ins
-# opencv3 is not available for ppc64
-%ifnarch ppc64
-%bcond_without opencv
-%else
-%bcond_with opencv
-%endif
 Name:           gmic
-Version:        2.9.6
+Version:        2.9.7
 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
@@ -63,10 +57,13 @@ BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(zlib)
-%if %{with opencv}
 # gmic first looks for opencv 4 and falls back to opencv 3 if not found.
 # opencv 4 in not available in leap <= 15.3
-%if 0%{?suse_version} <= 1500
+%if 0%{?suse_version} <= 1500 
+BuildRequires:  pkgconfig(opencv)
+%else
+# ppc64 doesn't have opencv4
+%ifarch ppc64
 BuildRequires:  pkgconfig(opencv)
 %else
 BuildRequires:  pkgconfig(opencv4)
@@ -190,7 +187,6 @@ cd ..
 cd ..
 popd
 
-%if %{with opencv}
 # Build zart
 pushd zart
 %qmake5 zart.pro \
@@ -199,7 +195,6 @@ pushd zart
    GMIC_PATH=%{_builddir}/%{name}-%{version}/src
 %make_jobs
 popd
-%endif
 
 %install
 %cmake_install
@@ -224,12 +219,10 @@ install -d -m 0755 %{buildroot}%{_gimpplugindir}
 install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt
 popd
 
-%if %{with opencv}
 # zart
 pushd zart
 install -m 0755 zart %{buildroot}%{_bindir}/zart
 popd
-%endif
 
 %post -n libgmic1 -p /sbin/ldconfig
 %postun -n libgmic1 -p /sbin/ldconfig
@@ -243,10 +236,8 @@ popd
 %{_datadir}/applications/gmic_qt.desktop
 %{_datadir}/pixmaps/gmic_qt.png
 
-%if %{with opencv}
 %files zart
 %{_bindir}/zart
-%endif
 
 %files -n gimp-plugin-gmic
 %license COPYING
diff --git a/gmic_2.9.6.tar.gz b/gmic_2.9.6.tar.gz
deleted file mode 100644
index e06af86..0000000
--- a/gmic_2.9.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d22fe8515af16dcd050d09a0bc7127ec29f4795ce732a0c6c3eaf839356bc11a
-size 7304588
diff --git a/gmic_2.9.7.tar.gz b/gmic_2.9.7.tar.gz
new file mode 100644
index 0000000..b249c30
--- /dev/null
+++ b/gmic_2.9.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:942537487ea722141230579db3cd4331368429c0e33cb38fee1b17aae9557f16
+size 7401418