From 1f7f4cdec365db12965e923275ee8f8ad3e432d9 Mon Sep 17 00:00:00 2001
From: Gianluca Sforna <giallu@gmail.com>
Date: Nov 12 2016 10:04:53 +0000
Subject: drop upstreamed patches


---

diff --git a/rdkit-2016.03-add_moldraw_headers.patch b/rdkit-2016.03-add_moldraw_headers.patch
deleted file mode 100644
index 8f7f7be..0000000
--- a/rdkit-2016.03-add_moldraw_headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Code/GraphMol/MolDraw2D/CMakeLists.txt b/Code/GraphMol/MolDraw2D/CMakeLists.txt
-index 40a158a..d9711f3 100644
---- a/Code/GraphMol/MolDraw2D/CMakeLists.txt
-+++ b/Code/GraphMol/MolDraw2D/CMakeLists.txt
-@@ -8,6 +8,8 @@ rdkit_headers(MolDraw2D.h
-   MolDraw2DSVG.h
-   MolDraw2Dwx.h
-   MolDraw2DUtils.h
-+  MolDraw2DDetails.h
-+  DEST GraphMol/MolDraw2D
- )
- 
- if(RDK_BUILD_QT_SUPPORT)
-@@ -22,7 +24,7 @@ if(RDK_BUILD_QT_SUPPORT)
- 
-   set(QTDRAW2D_SRC MolDraw2DQt.cpp)
-   set(EXTRA_LOCAL_LIBS ${EXTRA_LOCAL_LIBS} ${Qt5Widgets_LIBRARIES}  ${Qt5OpenGL_LIBRARIES} )
--  rdkit_headers(MolDraw2DQt.h)
-+  rdkit_headers(MolDraw2DQt.h DEST GraphMol/MolDraw2D)
- endif(RDK_BUILD_QT_SUPPORT)
- 
- if(RDK_BUILD_CAIRO_SUPPORT)
-@@ -31,7 +33,7 @@ if(RDK_BUILD_CAIRO_SUPPORT)
-   set(EXTRA_LOCAL_LIBS ${EXTRA_LOCAL_LIBS} ${CAIRO_LIBRARIES} )
-   ADD_DEFINITIONS("-DRDK_CAIRO_BUILD")
-   set(CAIRODRAW2D_SRC MolDraw2DCairo.cpp)
--  rdkit_headers(MolDraw2DCairo.h)
-+  rdkit_headers(MolDraw2DCairo.h DEST GraphMol/MolDraw2D)
- endif(RDK_BUILD_CAIRO_SUPPORT)
- 
- rdkit_library(MolDraw2D MolDraw2D.cpp MolDraw2DSVG.cpp
diff --git a/rdkit-verbose_failure.patch b/rdkit-verbose_failure.patch
deleted file mode 100644
index 2a9eec6..0000000
--- a/rdkit-verbose_failure.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/rdkit/TestRunner.py b/rdkit/TestRunner.py
-index c5f34d1..910b5a3 100755
---- a/rdkit/TestRunner.py
-+++ b/rdkit/TestRunner.py
-@@ -22,7 +22,7 @@ TEST_PASSED=0
- def RunTest(exeName,args,extras):
-   if exeName=="python":
-     exeName=RDConfig.pythonExe
--  args = args.split(' ')  
-+  args = args.split(' ')
- 
-   startDir = os.getcwd()
-   if 'dir' in extras:
-@@ -65,7 +65,7 @@ def RunScript(script,doLongTests,verbose):
-     tests = mod.tests
-   except AttributeError:
-     return [],0
--    
-+
-   longTests = []
-   if doLongTests:
-     try:
-@@ -101,11 +101,14 @@ def RunScript(script,doLongTests,verbose):
-         # return immediately
-         sys.stderr.write("Exitng from %s\n" % str([exeName]+list(args)))
-         return failed, len(tests) + i + 1
--  
-+
-   nTests = len(tests)+len(longTests)
-   del sys.modules[script]
-+  if verbose and failed:
-+    for exeName,args,extras in failed:
-+      print("!!! TEST FAILURE: ",exeName,args,extras,file=sys.stderr)
-   return failed,nTests
--  
-+
- def ReportResults(script,failedTests,nTests,runTime,verbose,dest):
-   if not nTests:
-     dest.write('!-!-!-!-!-!-!-!-!-!-!\n')
-@@ -122,7 +125,7 @@ def ReportResults(script,failedTests,nTests,runTime,verbose,dest):
-         dirName = os.path.abspath(dirName)
-         dest.write('\t\t(%s): %s %s\n'%(dirName,exeName,args))
- 
--  
-+
- if __name__=='__main__':
-   import getopt
-   args,extras = getopt.getopt(sys.argv[1:],'lv')
-@@ -133,7 +136,7 @@ if __name__=='__main__':
-       doLongTests=1
-     elif arg == '-v':
-       verbose=0
--  
-+
-   pwd = os.getcwd()
-   totNumFailed=0
-   totNumRun=0
-@@ -180,7 +183,7 @@ if __name__=='__main__':
-     else:
-       sys.stderr.write('  All %d tests (in %d modules) passed\n'%(totNumRun,len(extras)))
-   sys.exit(totNumFailed)
--      
--        
--    
--        
-+
-+
-+
-+
diff --git a/rdkit.spec b/rdkit.spec
index 098234b..b146696 100644
--- a/rdkit.spec
+++ b/rdkit.spec
@@ -80,8 +80,6 @@ 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
-Patch10:        rdkit-verbose_failure.patch
-Patch11:        rdkit-2016.03-add_moldraw_headers.patch
 
 %description
 Chemical informatics and machine learning toolkit
@@ -157,8 +155,6 @@ pushd python2
 %patch2 -p1
 %patch4 -p1
 %patch7 -p1
-%patch10 -p1
-%patch11 -p1
 
 rm -rf rdkit/sping
 
@@ -339,6 +335,7 @@ popd
 * Fri Nov 11 2016 Gianluca Sforna <giallu@gmail.com> - 2016.09.1-1
 - new upstream release
 - fix ppc/ppc64 build
+- drop upstreamed patches
 
 * Wed Nov  2 2016 Gianluca Sforna <giallu@gmail.com> - 2016.03.5-1
 - new upstream release