From 65114c4608132bc32bea70168e20c452aae20bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Fri, 23 Feb 2018 16:33:55 +0000
Subject: [PATCH] Update to 2.2.0 release.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License change from CeCILL and GPLv3+ to (CeCILL or CeCILL-C) and
GPLv3+

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 gmic.spec | 10 +++++++---
 sources   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gmic.spec b/gmic.spec
index 94f138f..3f0a55a 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -9,8 +9,8 @@
 
 Summary: GREYC's Magic for Image Computing
 Name: gmic
-Version: 2.1.8
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 Source0: http://gmic.eu/files/source/%{name}_%{version}.tar.gz
 # GIT archive snapshot of https://github.com/c-koi/zart
 Source1: zart-%{zart_version}.tar.gz
@@ -18,7 +18,7 @@ Source1: zart-%{zart_version}.tar.gz
 Source2: gmic-qt-%{gmic_qt_version}.tar.gz
 # GIT archive snapshot of https://github.com/dtschump/gmic-community
 Source3: gmic-community-%{gmic_community_version}.tar.gz
-License: CeCILL and GPLv3+
+License: (CeCILL or CeCILL-C) and GPLv3+
 Url: http://gmic.sourceforge.net/index.shtml
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Group: Applications/Multimedia
@@ -156,6 +156,10 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic
 %{gimpplugindir}/gmic_film_cluts.gmz
 
 %changelog
+* Thu Feb 22 2018 Daniel P. Berrange <berrange@redhat.com> - 2.2.0-1
+- Update to new 2.2.0 upstream release
+- Some parts now licensed under choice of CeCILL or CeCILL-C
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 1c08082..07fb952 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (gmic_2.1.8.tar.gz) = 2629ac29ae65615c281a31e85fbfdcab78259efc4845a30b32edc0b39ce2dfac1ae664545d20dc9fb2f86ec1a5b063b30d21e44e6c0dafe0e0f9b2febd270034
+SHA512 (gmic_2.2.0.tar.gz) = c77d1fa0eb8cf0273371f6657a622da906a8ec0864815a9a77ecdf15d18765ed136651120990f81c7b5671397d8036b3cf5b66074a1dfe077ab1650cd7d294d2
 SHA512 (zart-20180110git54bc6ec.tar.gz) = 3922f571174483d6834bab089cb873eef7f8d8dceaa8978f6f70c5a5ff85900d687da1e8aadfd3ab9eb0e79e0062d43841ee474eaa6f7d56729f6dd38c220cc8
 SHA512 (gmic-qt-20180110git6267a65.tar.gz) = 44798f1ff7e734d12ca75fdd759cc98c3b7508c256f0bf3418fccaeacf730ed8b133c7b0f6c6ce308ad1275c59feb119066c71b491280a1df6d8f7a820b4aaa2
 SHA512 (gmic-community-20180110git1ac6216.tar.gz) = f99c90fc5f7d0cdbfcf31ac1edc8ddc0951818643aba7ca3203af5402cfaf9e6cd5c61681922d31cd73eafe6dd6fa6b8e29cfeb31875fd2df7a7a9856e4eeb0b