[packages/plplot] - up to 5.10.0

[baggins]

commit c445855f52994afa8eac18e3943ca3d882588b4f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 16 22:15:10 2014 +0100

    - up to 5.10.0

 plplot-cmake.patch | 13 -------------
 plplot-link.patch  | 26 --------------------------
 plplot.spec        | 10 +++-------
 3 files changed, 3 insertions(+), 46 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index ab51fd4..e3c63cb 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -21,16 +21,14 @@
 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.9.9
-Release:	12
+Version:	5.10.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-# Source0-md5:	9f2c8536a58875d97ab6b29bbed67d26
+# Source0-md5:	ece8c0b4d5cd815968a6d56bed0fbe7b
 Patch0:		%{name}-octave.patch
 Patch1:		%{name}-qhull.patch
-Patch2:		%{name}-link.patch
-Patch3:		%{name}-cmake.patch
 Patch4:		%{name}-nofonts.patch
 Patch5:		%{name}-adadirs.patch
 Patch6:		%{name}-ocamldir.patch
@@ -620,8 +618,6 @@ Biblioteka PLplot - przykłady do wiązania dla Pythona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
diff --git a/plplot-cmake.patch b/plplot-cmake.patch
deleted file mode 100644
index e05abf1..0000000
--- a/plplot-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- plplot-5.9.9/scripts/CMakeLists.txt.orig	2011-10-13 02:43:01.000000000 +0200
-+++ plplot-5.9.9/scripts/CMakeLists.txt	2011-11-19 07:31:37.394399567 +0100
-@@ -30,8 +30,8 @@
-   if(PLD_pstex)
-     set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
-   endif(PLD_pstex)
--  if (NOT ${scripts_SCRIPTS} STREQUAL "")
-+  if (NOT "${scripts_SCRIPTS}" STREQUAL "")
-     install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
--  endif (NOT ${scripts_SCRIPTS} STREQUAL "")
-+  endif (NOT "${scripts_SCRIPTS}" STREQUAL "")
- endif(HAVE_BASH)
- 
diff --git a/plplot-link.patch b/plplot-link.patch
deleted file mode 100644
index d28a58a..0000000
--- a/plplot-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- plplot-5.9.9/lib/nn/CMakeLists.txt.orig	2011-10-13 02:43:01.000000000 +0200
-+++ plplot-5.9.9/lib/nn/CMakeLists.txt	2011-11-18 21:55:24.366575267 +0100
-@@ -46,7 +46,7 @@
-     COMPILE_FLAGS "-I${QHULL_INCLUDE_DIRS}"
-     INSTALL_NAME_DIR "${LIB_DIR}"
-     )
--  target_link_libraries(csironn ${QHULL_LIBRARIES})
-+  target_link_libraries(csironn ${QHULL_LIBRARIES} m)
-   install(TARGETS csironn
-     EXPORT export_plplot
-     ARCHIVE DESTINATION ${LIB_DIR}
---- plplot-5.9.9/bindings/f77/CMakeLists.txt.orig	2011-10-13 02:43:01.000000000 +0200
-+++ plplot-5.9.9/bindings/f77/CMakeLists.txt	2013-06-24 14:36:00.674116925 +0200
-@@ -205,10 +205,10 @@
- 
-   if(STATIC_OPTS)
-     add_library(plplotf77opts${LIB_TAG} STATIC ${plplotf77opts${LIB_TAG}_LIB_SRCS})
--    target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
-+    target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG} c)
-     target_link_libraries(plplotf77opts${LIB_TAG} plplotf77${LIB_TAG} plplotf77c${LIB_TAG})
-   else(STATIC_OPTS)
--    target_link_libraries(plplotf77${LIB_TAG}  plplotf77c${LIB_TAG})
-+    target_link_libraries(plplotf77${LIB_TAG}  plplotf77c${LIB_TAG} c)
-   endif(STATIC_OPTS)
- 
-   if(USE_RPATH)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/plplot.git/commitdiff/c445855f52994afa8eac18e3943ca3d882588b4f