[packages/plplot] - started update to 5.12.0
baggins
baggins at pld-linux.org
Fri May 26 09:53:06 CEST 2017
commit 58718998c5f2e1523605858d9f21c9a27bb0b877
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri May 26 09:52:51 2017 +0200
- started update to 5.12.0
plplot-no-DISPLAY.patch | 12 ++++++------
plplot-nofonts.patch | 25 -------------------------
plplot-octave.patch | 12 ++++++------
plplot-qhull.patch | 33 ---------------------------------
plplot.spec | 16 ++++++----------
5 files changed, 18 insertions(+), 80 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index cf98c90..9e37deb 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -34,17 +34,15 @@
Summary: PLplot - a library of functions that are useful for making scientific plots
Summary(pl.UTF-8): PLplot - biblioteka funkcji przydatnych do tworzenia wykresów naukowych
Name: plplot
-Version: 5.11.1
-Release: 5
+Version: 5.12.0
+Release: 0.1
License: LGPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-# Source0-md5: 7a3dbbe49a00f925b095bc06cadbaf63
+# Source0-md5: 998a05be218e5de8f2faf988b8dbdc51
Patch0: %{name}-octave.patch
-Patch1: %{name}-qhull.patch
Patch2: %{name}-no-DISPLAY.patch
Patch3: %{name}-plmeta.patch
-Patch4: %{name}-nofonts.patch
Patch5: %{name}-adadirs.patch
Patch6: %{name}-ocamldir.patch
Patch7: %{name}-d.patch
@@ -625,10 +623,8 @@ Biblioteka PLplot - przykłady do wiązania dla Pythona.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -760,7 +756,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libqsastime.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libqsastime.so.0
%attr(755,root,root) %{_libdir}/libplplot.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplplot.so.13
+%attr(755,root,root) %ghost %{_libdir}/libplplot.so.14
%if %{with plmeta}
%{_mandir}/man1/plm2gif.1*
%{_mandir}/man1/plpr.1*
@@ -802,8 +798,8 @@ rm -rf $RPM_BUILD_ROOT
%files driver-ntk
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/plplot%{version}/drivers/ntk.so
-%{_libdir}/plplot%{version}/drivers/ntk.driver_info
+#%attr(755,root,root) %{_libdir}/plplot%{version}/drivers/ntk.so
+#%{_libdir}/plplot%{version}/drivers/ntk.driver_info
%files driver-pdf
%defattr(644,root,root,755)
diff --git a/plplot-no-DISPLAY.patch b/plplot-no-DISPLAY.patch
index 53c3cea..a4ced13 100644
--- a/plplot-no-DISPLAY.patch
+++ b/plplot-no-DISPLAY.patch
@@ -54,36 +54,36 @@
- elseif(TK_RC)
- message(STATUS "Looking for Tk version with tclsh - not found")
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- else(NOT TK_RC AND _plplot_tk_version STREQUAL PLPLOT_TK_VERSION)
- message(STATUS "Tk version = ${_plplot_tk_version} found by tclsh is not consistent with
- Tk version = ${PLPLOT_TK_VERSION} found by wish"
- )
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- endif(NOT TK_RC AND _plplot_tk_version STREQUAL PLPLOT_TK_VERSION)
- elseif(TCL_RC)
- message(STATUS "Looking for Tcl version with wish - not found")
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- else(NOT TCL_RC AND _plplot_tcl_version STREQUAL PLPLOT_TCL_VERSION)
- message(STATUS "Tcl version = ${_plplot_tcl_version} found by wish is not consistent with
- Tcl version = ${PLPLOT_TCL_VERSION} found by tclsh"
- )
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- endif(NOT TCL_RC AND _plplot_tcl_version STREQUAL PLPLOT_TCL_VERSION)
- else(PLPLOT_TCL_VERSION STREQUAL PLPLOT_TK_VERSION)
- message(STATUS "Tk version = ${PLPLOT_TK_VERSION} found by wish is not consistent with
- Tcl version = ${PLPLOT_TCL_VERSION} found by tclsh"
- )
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- endif(PLPLOT_TCL_VERSION STREQUAL PLPLOT_TK_VERSION)
- else(NOT TK_RC)
- message(STATUS "Looking for Tk version with wish - not found")
- message(STATUS "WARNING: setting ENABLE_tk to OFF")
-- set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE)
+- set(ENABLE_tk OFF CACHE BOOL "Enable Tk binding" FORCE)
- endif(NOT TK_RC)
else(NOT PLPLOT_TK_VERSION)
set(TK_RC 0)
diff --git a/plplot-nofonts.patch b/plplot-nofonts.patch
deleted file mode 100644
index af0f868..0000000
--- a/plplot-nofonts.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- plplot-5.9.9/cmake/modules/freetype.cmake.orig 2011-10-13 02:43:01.000000000 +0200
-+++ plplot-5.9.9/cmake/modules/freetype.cmake 2011-11-19 16:31:29.385484168 +0100
-@@ -102,22 +102,6 @@
- )
- endforeach(FONT_ENTRY PL_FREETYPE_FONT_LIST)
-
-- # Check a couple of fonts actually exists
-- if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
-- if (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
-- else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
-- message("Fonts not found - disabling freetype")
-- set(WITH_FREETYPE OFF CACHE BOOL
-- "Enable driver options for using freetype library for fonts" FORCE
-- )
-- endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SYMBOL})
-- else (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
-- message("Fonts not found - disabling freetype")
-- set(WITH_FREETYPE OFF CACHE BOOL
-- "Enable driver options for using freetype library for fonts" FORCE
-- )
-- endif (EXISTS ${PL_FREETYPE_FONT_DIR}${PL_FREETYPE_SANS})
--
- endif (WITH_FREETYPE)
-
- if (WITH_FREETYPE)
diff --git a/plplot-octave.patch b/plplot-octave.patch
index 3b67c27..707ecbc 100644
--- a/plplot-octave.patch
+++ b/plplot-octave.patch
@@ -1,7 +1,7 @@
--- plplot-5.9.9/cmake/modules/octave.cmake.orig 2011-10-13 02:43:01.000000000 +0200
+++ plplot-5.9.9/cmake/modules/octave.cmake 2011-11-18 21:36:22.706537040 +0100
@@ -241,6 +241,7 @@
-
+
# octave-2.1 (or higher) logic.
#_OCTAVE_M_DIR
+ if(NOT DEFINED OCTAVE_M_DIR)
@@ -25,22 +25,22 @@
#message(STATUS "(CMake) _OCTAVE_M_DIR = ${_OCTAVE_M_DIR}")
+ endif(NOT DEFINED OCTAVE_M_DIR)
+ message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
-
+
#OCTAVE_OCT_DIR
if(NOT DEFINED OCTAVE_OCT_DIR)
@@ -268,15 +279,6 @@
#message(STATUS "(CMake) OCTAVE_OCT_DIR = ${OCTAVE_OCT_DIR}")
endif(NOT DEFINED OCTAVE_OCT_DIR)
-
+
- # Replace the OCTAVE_PREFIX with the PLplot prefix in OCTAVE_M_DIR
- string(REPLACE
-- "${OCTAVE_PREFIX}"
+- "${OCTAVE_PREFIX}"
- "${CMAKE_INSTALL_PREFIX}"
- OCTAVE_M_DIR
- ${_OCTAVE_M_DIR}
- )
- message(STATUS "OCTAVE_M_DIR = ${OCTAVE_M_DIR}")
--
+-
# Transform OCTAVE_OCT_DIR if prefixes not the same.
if(NOT CMAKE_INSTALL_PREFIX STREQUAL "${OCTAVE_PREFIX}")
- set(OCTAVE_OCT_DIR ${PLPLOT_OCTAVE_DIR})
+ set(OCTAVE_OCT_DIR ${CMAKE_INSTALL_LIBDIR}/octave)
diff --git a/plplot-qhull.patch b/plplot-qhull.patch
deleted file mode 100644
index 39fe7ca..0000000
--- a/plplot-qhull.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- plplot-5.11.1/cmake/modules/FindQHULL.cmake.orig 2015-08-12 19:35:27.000000000 +0200
-+++ plplot-5.11.1/cmake/modules/FindQHULL.cmake 2016-03-10 21:50:37.757900267 +0100
-@@ -9,7 +9,7 @@
-
- include(FindPackageHandleStandardArgs)
-
--find_path(QHULL_INCLUDE_DIR qhull/qhull_a.h)
-+find_path(QHULL_INCLUDE_DIR libqhull/qhull_a.h)
-
- if(QHULL_INCLUDE_DIR)
- set(QHULL_INCLUDE_DIRS ${QHULL_INCLUDE_DIR})
---- plplot-5.9.6/src/plgridd.c~ 2010-06-05 18:11:39.000000000 +0200
-+++ plplot-5.9.6/src/plgridd.c 2011-09-10 20:50:09.332285828 +0200
-@@ -32,7 +32,7 @@
-
- #ifdef HAVE_QHULL
- #include "../lib/nn/nn.h"
--#include <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- #endif
-
- /* forward declarations */
---- plplot-5.9.6/lib/nn/delaunay.c~ 2010-06-05 18:11:40.000000000 +0200
-+++ plplot-5.9.6/lib/nn/delaunay.c 2011-09-10 20:50:20.115858331 +0200
-@@ -34,7 +34,7 @@
- #include <limits.h>
- #include <float.h>
- #ifdef USE_QHULL
--#include <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- #else
- #include "triangle.h"
- #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/58718998c5f2e1523605858d9f21c9a27bb0b877
More information about the pld-cvs-commit
mailing list