[plplot/el5/master] - Rebase info patch - Add new patches to handle new cmake 2.6 behavior with wxWidgets and Fortran
Orion Poplawski
orion at fedoraproject.org
Fri Aug 20 16:48:03 UTC 2010
commit 7cdd711cc5d058cd87bb647860bf047438c1da28
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Aug 20 10:47:52 2010 -0600
- Rebase info patch
- Add new patches to handle new cmake 2.6 behavior with wxWidgets
and Fortran modules
plplot-5.6.1-info.patch | 13 ------------
plplot-5.7.3-fmod.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++
plplot-5.7.3-info.patch | 13 ++++++++++++
plplot-5.7.3-wx.patch | 16 +++++++++++++++
plplot.spec | 13 ++++++++++-
5 files changed, 89 insertions(+), 15 deletions(-)
---
diff --git a/plplot-5.7.3-fmod.patch b/plplot-5.7.3-fmod.patch
new file mode 100644
index 0000000..b05f097
--- /dev/null
+++ b/plplot-5.7.3-fmod.patch
@@ -0,0 +1,49 @@
+diff -up plplot-5.7.3/bindings/f95/CMakeLists.txt.fmod plplot-5.7.3/bindings/f95/CMakeLists.txt
+--- plplot-5.7.3/bindings/f95/CMakeLists.txt.fmod 2007-03-25 18:41:51.000000000 -0600
++++ plplot-5.7.3/bindings/f95/CMakeLists.txt 2010-08-20 10:04:15.448341149 -0600
+@@ -107,12 +107,12 @@ LIBRARY DESTINATION ${LIB_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}
+ )
+
+-# Yuk! All Makefiles are run from the top level build directory and
+-# so the f90 .mod files end up there rather than in the bindings/f95
+-# directory. Ifort and pgf90 both have a -module command line option to
+-# override this location, but I'm not sure how portable that?
++# For CMake-2.6.0 and above, the module files are created by
++# default during the library build in the bindings/f95 directory.
+ install(
+-FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod
++FILES ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod
++ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod
++ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod
+ DESTINATION ${F95_MOD_DIR}
+ )
+
+diff -up plplot-5.7.3/examples/f95/CMakeLists.txt.fmod plplot-5.7.3/examples/f95/CMakeLists.txt
+--- plplot-5.7.3/examples/f95/CMakeLists.txt.fmod 2007-03-25 18:41:56.000000000 -0600
++++ plplot-5.7.3/examples/f95/CMakeLists.txt 2010-08-20 09:48:10.096956534 -0600
+@@ -48,22 +48,9 @@ set(f95_STRING_INDICES
+ set(ENABLE_BUILDTREE_EXAMPLES ON)
+ if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+ remove_definitions("-DHAVE_CONFIG_H")
+- # N.B. This is required because it's the location of plplot.mod
+- # generated as a by-product of building libplplotf95${LIB_TAG}.
+- include_directories(${CMAKE_BINARY_DIR})
++ #This is where the .mod files are
++ include_directories(${CMAKE_BINARY_DIR}/bindings/f95)
+
+- # Temporary workaround for module handling bug in CMake 2.4.3. Create a
+- # file with arbitrary contents called plplot.mod.proxy in top-level
+- # build tree. As a temporary measure we use cmake_workaround.f as the
+- # generator of this file. (cmake_workaround.f was previously compiled,
+- # but that is no longer the case.) Note, once CMake is fixed this comment
+- # the following configure_file command and cmake_workaround.f should all
+- # just disappear.
+- configure_file(
+- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f
+- ${CMAKE_BINARY_DIR}/plplot.mod.proxy
+- COPYONLY
+- )
+ endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+ foreach(STRING_INDEX ${f95_STRING_INDICES})
+ set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90)
diff --git a/plplot-5.7.3-info.patch b/plplot-5.7.3-info.patch
new file mode 100644
index 0000000..39a9de3
--- /dev/null
+++ b/plplot-5.7.3-info.patch
@@ -0,0 +1,13 @@
+--- plplot-5.7.3/doc/docbook/src/plplotdoc.info.orig 2007-03-25 18:41:53.000000000 -0600
++++ plplot-5.7.3/doc/docbook/src/plplotdoc.info 2010-08-20 09:41:40.788018048 -0600
+@@ -3,8 +3,9 @@
+ produced by makeinfo version 4.8 from
+ /tmp/plplot-dist-prep/build_dir/doc/docbook/src/plplotdoc.texi.
+
++INFO-DIR-SECTION Scientific Visualization
+ START-INFO-DIR-ENTRY
+-* The PLplot Plotting Library: . ???
++* PLplot: (plplotdoc). The PLplot Plotting Library.
+ END-INFO-DIR-ENTRY
+
+
diff --git a/plplot-5.7.3-wx.patch b/plplot-5.7.3-wx.patch
new file mode 100644
index 0000000..fbb6bef
--- /dev/null
+++ b/plplot-5.7.3-wx.patch
@@ -0,0 +1,16 @@
+--- plplot-5.7.4/cmake/modules/wxwidgets.cmake.wx 2007-08-13 18:37:10.000000000 -0600
++++ plplot-5.7.4/cmake/modules/wxwidgets.cmake 2010-08-19 15:33:15.336167451 -0600
+@@ -40,8 +40,12 @@
+
+ if(PLD_wxwidgets)
+ string(REGEX REPLACE ";" " -I"
++ wxwidgets_INCLUDES
++ "-I${wxWidgets_INCLUDE_DIRS}"
++ )
++ string(REGEX REPLACE ";" " "
+ wxwidgets_COMPILE_FLAGS
+- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}"
++ "${wxwidgets_INCLUDES} ${wxWidgets_DEFINITIONS}"
+ )
+ set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES})
+ if(WITH_FREETYPE)
diff --git a/plplot.spec b/plplot.spec
index 2dfbf78..99f13dc 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -5,7 +5,7 @@
Name: plplot
Version: 5.7.3
-Release: 3%{?dist}.1
+Release: 3%{?dist}.2
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -13,7 +13,9 @@ License: LGPL
URL: http://plplot.sourceforge.net/
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
Patch1: plplot-5.6.1-octave.patch
-Patch2: plplot-5.6.1-info.patch
+Patch2: plplot-5.7.3-info.patch
+Patch3: plplot-5.7.3-wx.patch
+Patch4: plplot-5.7.3-fmod.patch
Patch5: plplot-5.7.2-multilib.patch
Patch6: plplot-5.7.3-jni.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -189,6 +191,8 @@ Requires: pkgconfig
%setup -q
%patch1 -p1 -b .octave
%patch2 -p1 -b .orig
+%patch3 -p1 -b .wx
+%patch4 -p1 -b .fmod
%patch5 -p1 -b .multilib
%patch6 -p1 -b .jni
@@ -468,6 +472,11 @@ fi
%{_libdir}/pkgconfig/plplotd-wxwidgets.pc
%changelog
+* Fri Aug 20 2010 Orion Poplawski <orion at cora.nwra.com> 5.7.3-3.2
+- Rebase info patch
+- Add new patches to handle new cmake 2.6 behavior with wxWidgets
+ and Fortran modules
+
* Mon Aug 6 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3.1
- Revert BR to gnome-python2 for EL
- pygtk2-devel is broken in EL-5, disable for now (bug #251029)
More information about the scm-commits
mailing list