[plplot/f18] Add patch from upstream to fix cmake handling

[Orion Poplawski]

commit f2f6ccf08f0ff3dd095265e3c78a31e7f674a67c
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Dec 14 09:47:07 2012 -0700

    Add patch from upstream to fix cmake handling

 plplot-cmake.patch |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 plplot.spec        |    9 ++++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/plplot-cmake.patch b/plplot-cmake.patch
new file mode 100644
index 0000000..cbe0763
--- /dev/null
+++ b/plplot-cmake.patch
@@ -0,0 +1,49 @@
+Only in plplot-5.9.9/cmake/modules/language_support/cmake: CMakeAdaInformation.cmake.svn
+diff -ru plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake plplot-trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
+--- plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake	2011-10-12 18:43:01.000000000 -0600
++++ plplot-trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake	2012-12-14 08:50:51.495394554 -0700
+@@ -55,8 +55,11 @@
+ 
+ # configure variables set in this file for fast reload later on
+ #CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in 
++#message(STATUS "DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
++#message(STATUS "DEBUG: CMAKE_FILES_DIRECTORY = ${CMAKE_FILES_DIRECTORY}")
++#message(STATUS "DEBUG: CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in 
+-               "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE)
++               "${CMAKE_PLATFORM_INFO_DIR}/CMakeAdaCompiler.cmake" IMMEDIATE)
+ MARK_AS_ADVANCED(CMAKE_AR)
+ 
+ SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA")
+diff -ru plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake plplot-trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
+--- plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake	2011-10-12 18:43:01.000000000 -0600
++++ plplot-trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake	2012-12-14 08:50:51.494394559 -0700
+@@ -99,10 +99,10 @@
+ # a different location.
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ 	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 
+-               "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
++               "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
+ ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ 	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
+-               "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
++               "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
+ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ 
+ MARK_AS_ADVANCED(CMAKE_AR)
+diff -ru plplot-5.9.9/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake plplot-trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
+--- plplot-5.9.9/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2011-10-12 18:43:01.000000000 -0600
++++ plplot-trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2012-12-14 08:50:51.495394554 -0700
+@@ -68,10 +68,10 @@
+   # a different location.
+   IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+   	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 
+-  	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
++  	  ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+   ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+   	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
+-	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
++	  ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ ENDIF(NOT CMAKE_D_COMPILER_WORKS)
+ 
diff --git a/plplot.spec b/plplot.spec
index 3abbc40..c4a5dd4 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -24,7 +24,7 @@
 
 Name:           plplot
 Version:        5.9.9
-Release:        11.svn12202%{?dist}
+Release:        12.svn12202%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -35,6 +35,9 @@ Patch0:         plplot-svn12202.patch
 # Add patch to pass octaveopts to octave tests
 Patch1:         plplot-octave.patch
 Patch2:         plplot-multiarch.patch
+# Patch from upstream to fix cmake handling
+Patch3:         plplot-cmake.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
@@ -325,6 +328,7 @@ Requires:       pkgconfig
 %patch0 -p1 -b .svn
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .multiarch
+%patch3 -p1 -b .cmake-ada
 
 
 %build
@@ -684,6 +688,9 @@ fi
 
 
 %changelog
+* Fri Dec 14 2012 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-12.svn12202
+- Add patch from upstream to fix cmake handling
+
 * Wed Oct 17 2012 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-11.svn12202
 - Rebuild for ocaml 4.00.1