[plplot] Add upstream patch to rename HAVE_CONFIG_H
Orion Poplawski
orion at fedoraproject.org
Tue Jun 10 00:28:42 UTC 2014
commit e6c17760a96388b7f9ed45a72f7dcadce57d209d
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Mon Jun 9 18:28:35 2014 -0600
Add upstream patch to rename HAVE_CONFIG_H
plplot-config.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++
plplot.spec | 9 +++++-
2 files changed, 95 insertions(+), 1 deletions(-)
---
diff --git a/plplot-config.patch b/plplot-config.patch
new file mode 100644
index 0000000..b79a0ea
--- /dev/null
+++ b/plplot-config.patch
@@ -0,0 +1,87 @@
+Index: bindings/ocaml/plcairo/CMakeLists.txt
+===================================================================
+--- bindings/ocaml/plcairo/CMakeLists.txt (revision 13095)
++++ bindings/ocaml/plcairo/CMakeLists.txt (revision 13097)
+@@ -36,7 +36,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
+ ${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so
+ ${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a
+- COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
++ COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
+ COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
+Index: bindings/ocaml/CMakeLists.txt
+===================================================================
+--- bindings/ocaml/CMakeLists.txt (revision 13095)
++++ bindings/ocaml/CMakeLists.txt (revision 13097)
+@@ -98,7 +98,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so
+ ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
+ COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
++ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
+ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 13095)
++++ CMakeLists.txt (revision 13097)
+@@ -125,7 +125,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
+ )
+ # Allow access to the generated plplot_config.h for this build.
+-add_definitions("-DHAVE_CONFIG_H")
++add_definitions("-DPLPLOT_HAVE_CONFIG_H")
+ # Install top-level files
+
+ # Enable testing framework for examples
+Index: include/plConfig.h.in
+===================================================================
+--- include/plConfig.h.in (revision 13095)
++++ include/plConfig.h.in (revision 13097)
+@@ -29,7 +29,7 @@
+ // any user applications). Therefore, the configured plConfig.h
+ // should be installed. In contrast, plplot_config.h.in (note,
+ // plConfig.h #includes plplot_config.h for the core build because
+-// HAVE_CONFIG_H is #defined in that case) contains configured macros
++// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros
+ // that are only required for the core build. Therefore, in contrast
+ // to plConfig.h, plplot_config.h should not be installed.
+ //
+@@ -43,7 +43,7 @@
+ #ifndef __PLCONFIG_H__
+ #define __PLCONFIG_H__
+
+-#ifdef HAVE_CONFIG_H
++#ifdef PLPLOT_HAVE_CONFIG_H
+ # include <plplot_config.h>
+ #endif
+
+Index: plplot_config.h.in
+===================================================================
+--- plplot_config.h.in (revision 13095)
++++ plplot_config.h.in (revision 13097)
+@@ -3,7 +3,7 @@
+ // examples (and presumably any user applications). Therefore, the
+ // configured plplot_config.h should not be installed. In contrast,
+ // include/plConfig.h.in (note, the configured plConfig.h result
+-// #includes plplot_config.h for the core build because HAVE_CONFIG_H
++// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H
+ // is #defined in that case) contains configured macros that are
+ // required for the core build, installed examples build, and build of
+ // user applications. Therefore, in contrast to plplot_config.h,
+Index: examples/CMakeLists.txt
+===================================================================
+--- examples/CMakeLists.txt (revision 13095)
++++ examples/CMakeLists.txt (revision 13097)
+@@ -414,7 +414,7 @@
+ endif(CORE_BUILD)
+
+ if(CORE_BUILD AND BUILD_TEST)
+- remove_definitions("-DHAVE_CONFIG_H")
++ remove_definitions("-DPLPLOT_HAVE_CONFIG_H")
+ endif(CORE_BUILD AND BUILD_TEST)
+
+ # Decide on device to be used for generic interactive tests.
diff --git a/plplot.spec b/plplot.spec
index d217599..de8148b 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -31,7 +31,7 @@
Name: plplot
Version: 5.10.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -50,6 +50,9 @@ Patch3: plplot-lua52.patch
Patch4: plplot-pkgconfig.patch
# Upstream patch for octave 3.8
Patch5: plplot-octave38.patch
+# Upstream patch to rename HAVE_CONFIG_H
+# svn diff -r13095:13097
+Patch6: plplot-config.patch
# Don't use -custom with ocamlc
Patch7: plplot-ocaml.patch
@@ -365,6 +368,7 @@ Requires: %{name}-wxGTK%{?_isa} = %{version}-%{release}
%endif
%patch4 -p1 -b .pkgconfig
%patch5 -p1 -b .octave38
+%patch6 -p0 -b .config
%patch7 -p1 -b .ocaml
# Emtpy file - fixed upstream
sed -i -e '/plplotdoc-html.proc/d' doc/docbook/src/HTML-MANIFEST
@@ -726,6 +730,9 @@ fi
%changelog
+* Mon Jun 9 2014 Orion Poplawski <orion at cora.nwra.com> - 5.10.0-9
+- Add upstream patch to rename HAVE_CONFIG_H
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list