From 9df63a6533b0e8909bd709c1bd0f27ccf49f605d0fd375959925d118170826c2 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Wed, 7 Nov 2018 14:40:48 +0000
Subject: [PATCH] Accepting request 646975 from home:darix:branches:graphics

- added cmake-fixes.patch:
  - allow older cmake versions again to allow building on distros
    older than TW
  - install cmake modules into the proper path

- update to 2.4.1
  https://discuss.pixls.us/t/release-of-gmic-2-4-0/8093
  https://discuss.pixls.us/t/on-the-road-to-2-5-0/9413

OBS-URL: https://build.opensuse.org/request/show/646975
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=14
---
 cmake-fixes.patch  | 25 +++++++++++++++++++++++++
 gmic.changes       | 15 +++++++++++++++
 gmic.spec          |  5 +++--
 gmic_2.3.6.tar.gz  |  3 ---
 gmic_2.4.1.tar.gz  |  3 +++
 gmic_reference.pdf |  4 ++--
 6 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 cmake-fixes.patch
 delete mode 100644 gmic_2.3.6.tar.gz
 create mode 100644 gmic_2.4.1.tar.gz

diff --git a/cmake-fixes.patch b/cmake-fixes.patch
new file mode 100644
index 0000000..7a83b44
--- /dev/null
+++ b/cmake-fixes.patch
@@ -0,0 +1,25 @@
+Index: gmic-2.4.1/CMakeLists.txt
+===================================================================
+--- gmic-2.4.1.orig/CMakeLists.txt
++++ gmic-2.4.1/CMakeLists.txt
+@@ -53,7 +53,7 @@
+ #  knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms.
+ #
+ 
+-cmake_minimum_required(VERSION 3.12)
++cmake_minimum_required(VERSION 3.5)
+ cmake_policy(SET CMP0046 OLD)
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+@@ -380,8 +380,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/
+ configure_package_config_file(
+   ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake
+-  INSTALL_DESTINATION lib/cmake/gmic
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic
+ )
+-install(EXPORT GmicTargets DESTINATION lib/cmake/gmic)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake DESTINATION lib/cmake/gmic)
++install(EXPORT GmicTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic)
+ feature_summary(WHAT ALL)
diff --git a/gmic.changes b/gmic.changes
index 812b117..6221a4c 100644
--- a/gmic.changes
+++ b/gmic.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Nov  7 12:30:34 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
+
+- added cmake-fixes.patch:
+  - allow older cmake versions again to allow building on distros
+    older than TW
+  - install cmake modules into the proper path
+
+-------------------------------------------------------------------
+Wed Nov  7 00:33:15 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 2.4.1
+  https://discuss.pixls.us/t/release-of-gmic-2-4-0/8093
+  https://discuss.pixls.us/t/on-the-road-to-2-5-0/9413
+
 -------------------------------------------------------------------
 Thu Aug 30 08:28:35 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>
 
diff --git a/gmic.spec b/gmic.spec
index fabc8dc..9d2155c 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -23,17 +23,17 @@
 #define __builder ninja
 
 Name:           gmic
-Version:        2.3.6
+Version:        2.4.1
 Release:        0
 URL:            https://gmic.eu
 
 Source0:        https://gmic.eu/files/source/gmic_%{version}.tar.gz
 Source10:       http://gmic.eu/gmic_reference.pdf
+Patch:          cmake-fixes.patch
 
 Summary:        GREYC's Magick for Image Computing (denoise and others)
 License:        CECILL-2.1
 Group:          Productivity/Graphics/Bitmap Editors
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  cmake
 BuildRequires:  OpenEXR-devel
@@ -277,5 +277,6 @@ popd
 %defattr(-,root,root)
 %{_includedir}/gmic.h
 %{_libdir}/libgmic.so
+%{_libdir}/cmake/gmic/
 
 %changelog
diff --git a/gmic_2.3.6.tar.gz b/gmic_2.3.6.tar.gz
deleted file mode 100644
index a7de72b..0000000
--- a/gmic_2.3.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86fe671879725863acecc207bdb86c4428635cd1a20d6043618864cf4c366113
-size 3723069
diff --git a/gmic_2.4.1.tar.gz b/gmic_2.4.1.tar.gz
new file mode 100644
index 0000000..8285ff2
--- /dev/null
+++ b/gmic_2.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6
+size 3809170
diff --git a/gmic_reference.pdf b/gmic_reference.pdf
index 66e2e6e..4dd0c2c 100644
--- a/gmic_reference.pdf
+++ b/gmic_reference.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:988c6fff02a8105c89d9b3a9dda2c658645570537f6115683c3ea22321bdb28d
-size 35833761
+oid sha256:bb2d275f41fb79dadac34cad56b511e778a2f1073ef1eb630f24938116bd0fb5
+size 63279425