From 798cc73ab1cbfe29df05199b25603ee0d0cba30d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Dec 23 2016 14:59:26 +0000
Subject: Merge branch 'master' into f25


---

diff --git a/.gitignore b/.gitignore
index b96cea0..6f3fe9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,7 @@
 /darktable-2.0.5.tar.xz
 /darktable-2.0.6.tar.xz
 /darktable-2.0.7.tar.xz
+/darktable-2.2.0.rc0.tar.xz
+/darktable-2.2.0.rc1.tar.xz
+/darktable-2.2.0.rc2.tar.xz
+/darktable-2.2.0.tar.xz
diff --git a/darktable.spec b/darktable.spec
index 2f9112f..133f55c 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -4,7 +4,7 @@
 %endif
 
 Name: darktable
-Version: 2.0.7
+Version: 2.2.0
 Release: 1%{?dist}
 
 Summary: Utility to organize and develop raw images
@@ -14,15 +14,15 @@ URL: http://www.darktable.org/
 Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/darktable-%{version}.tar.xz
 
 BuildRequires: cairo-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 3.0
 BuildRequires: colord-gtk-devel
 BuildRequires: colord-devel
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
-BuildRequires: exiv2-devel
+BuildRequires: exiv2-devel >= 0.24
 BuildRequires: flickcurl-devel
 BuildRequires: GraphicsMagick-devel
-BuildRequires: gtk3-devel
+BuildRequires: gtk3-devel >= 3.14
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: json-glib-devel
@@ -40,7 +40,7 @@ BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel
 BuildRequires: opencl-headers
 BuildRequires: OpenEXR-devel >= 1.6
-BuildRequires: openjpeg-devel
+BuildRequires: openjpeg2-devel
 %if 0%{?with_osm_gps_map_devel}
 BuildRequires: osm-gps-map-devel >= 1.0
 %endif
@@ -49,11 +49,15 @@ BuildRequires: pkgconfig >= 0.22
 BuildRequires: po4a
 BuildRequires: /usr/bin/pod2man
 BuildRequires: pugixml-devel
-BuildRequires: SDL-devel
 BuildRequires: sqlite-devel
 
+# Concerning rawspeed bundled library, see
+# https://fedorahosted.org/fpc/ticket/550#comment:9
+Provides: bundled(rawspeed)
+Provides: bundled(lua)
+
 # uses xmmintrin.h
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64 aarch64
 
 
 %description
@@ -71,8 +75,10 @@ echo directory: %{name}-%{version}
 rm -rf src/external/CL
 sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt
 
-# Remove bundled lua
-rm -rf src/external/lua/
+# Remove bundled lua.
+# Line commented because we temporarily enabled bundled Lua while waiting for
+# a compat-lua-52 package
+# rm -rf src/external/lua/
 
 %build
 mkdir %{_target_platform} 
@@ -82,6 +88,7 @@ pushd %{_target_platform}
         -DUSE_GEO:BOOLEAN=ON \
         -DCMAKE_BUILD_TYPE:STRING=Release \
         -DBINARY_PACKAGE_BUILD=1 \
+        -DDONT_USE_INTERNAL_LUA=OFF \
         -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \
         ..
 
@@ -120,14 +127,16 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang 
-%license doc/LICENSE
-%doc doc/README doc/AUTHORS doc/TRANSLATORS
+%license LICENSE
+%doc doc/README
 %{_bindir}/darktable
+%{_bindir}/darktable-chart
 %{_bindir}/darktable-cli
 %{_bindir}/darktable-cltest
 %{_bindir}/darktable-cmstest
 %{_bindir}/darktable-generate-cache
-%{_bindir}/darktable-viewer
+%{_bindir}/darktable-rs-identify
+#%{_bindir}/darktable-viewer
 %{_libdir}/darktable
 %{_datadir}/darktable
 %{_datadir}/applications/darktable.desktop
@@ -138,6 +147,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/darktable/
 
 %changelog
+* Fri Dec 23 2016 Germano Massullo <germano.massullo@gmail.com> - 2.2.0-1
+- 2.2.0 release
+
+* Mon Dec 05 2016 Germano Massullo <germano.massullo@gmail.com> - 2.2.0.rc2-0.1
+- 2.2.0 RC2
+
+* Fri Nov 25 2016 Germano Massullo <germano.massullo@gmail.com> - 2.2.0.rc1-0.1
+- 2.2.0 RC1
+- Enabled bundled Lua, while discussing the creation of a compat-lua-52 package with Fedora Lua Special Interest Group
+
+* Sun Nov 06 2016 Germano Massullo <germano.massullo@gmail.com> - 2.2.0.rc0-0.1
+- 2.2.0 release candidate
+- Enforced dependencies versions according to 2.2.0 requirements
+
+* Wed Oct 26 2016 Germano Massullo <germano.massullo@gmail.com> - 2.0.7-2
+- Added rawspeed bundled library details
+
 * Tue Oct 25 2016 Germano Massullo <germano.massullo@gmail.com> - 2.0.7-1
 - Minor update
 
diff --git a/sources b/sources
index 2a88f55..14f5252 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0735bec8c3a684f84624172c04c3e41  darktable-2.0.7.tar.xz
+SHA512 (darktable-2.2.0.tar.xz) = b1acdaacc397d8752d32c5d8a8329222da7d87f159c21b467c950cd9ad61ec331d6dfc3f9e034c44484e8bf082d4df4e9dc01394e018f97c2adc6d09641a9085