From 3935bb5c2608f5b02c4d93ebb7c4d34cecc17de3 Mon Sep 17 00:00:00 2001
From: Gianluca Sforna <giallu@gmail.com>
Date: Jul 21 2017 07:52:20 +0000
Subject: fix FTBS in rawhide


---

diff --git a/rdkit-2017.03-remove_xlocale.patch b/rdkit-2017.03-remove_xlocale.patch
index 5920b9c..bde90f1 100644
--- a/rdkit-2017.03-remove_xlocale.patch
+++ b/rdkit-2017.03-remove_xlocale.patch
@@ -1,12 +1,17 @@
 diff --git a/Code/RDGeneral/LocaleSwitcher.cpp b/Code/RDGeneral/LocaleSwitcher.cpp
-index 32ce476..7202097 100644
+index 32ce476..032393c 100644
 --- a/Code/RDGeneral/LocaleSwitcher.cpp
 +++ b/Code/RDGeneral/LocaleSwitcher.cpp
-@@ -33,7 +33,6 @@
+@@ -32,11 +32,8 @@
+ 
  // LocaleSwitcher Dependencies
  #include <clocale>
- #ifndef _WIN32
--#include <xlocale.h>
- #include <string>
- #else
- #include <locale.h>
+-#ifndef _WIN32
++#ifdef __clang__
+ #include <xlocale.h>
+-#include <string>
+-#else
+-#include <locale.h>
+ #endif
+ 
+ #ifdef RDK_THREADSAFE_SSS
diff --git a/rdkit.spec b/rdkit.spec
index dba47e1..50b09b2 100644
--- a/rdkit.spec
+++ b/rdkit.spec
@@ -14,7 +14,7 @@
 
 Name:           rdkit
 Version:        %{year}.%{month}.%{extraver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Chemical informatics and machine learning toolkit
 License:        BSD
 URL:            http://www.rdkit.org/
@@ -79,6 +79,9 @@ Patch1:         rdkit-2015.03-use_cairo_backend_on_tests.patch
 Patch2:         rdkit-2014.09-do_not_install_sping.patch
 Patch4:         rdkit-2014.09-fix_cmake_files_path.patch
 Patch7:         rdkit-2015.03-dont_install_contrib.patch
+
+# Will be upstreamed in 2017.03.4
+# https://github.com/rdkit/rdkit/pull/1501
 Patch8:         rdkit-2017.03-remove_xlocale.patch
 
 %description
@@ -287,7 +290,7 @@ pushd python2
 export RDBASE=%{_builddir}/%{rootdir}/python2
 export LD_LIBRARY_PATH=$RDBASE/lib
 export PYTHONPATH=$RDBASE
-ARGS="-V -E testPgSQL -E pythonTestSping" make test
+ARGS="-V -E 'pythonTestSping|testPgSQL'" make test
 popd
 
 %if 0%{?fedora} && 0%{?with_py3}
@@ -295,7 +298,7 @@ pushd python3
 export RDBASE=%{_builddir}/%{rootdir}/python3
 export LD_LIBRARY_PATH=$RDBASE/lib
 export PYTHONPATH=$RDBASE
-ARGS="-V -E testPgSQL -E pythonTestSping" make test
+ARGS="-V -E 'pythonTestSping|testPgSQL'" make test
 popd
 %endif
 %endif
@@ -335,6 +338,9 @@ popd
 %{_datadir}/pgsql/extension/rdkit.control
 
 %changelog
+* Fri Jul 21 2017 Gianluca Sforna <giallu@gmail.com> - 2017.3.3-2
+- fix FTBS in rawhide
+
 * Mon Jul 10 2017 Gianluca Sforna <giallu@gmail.com> - 2017.3.3-1
 - new upstream release