- up to 5.14.0

diff --git a/plplot-adadirs.patch b/plplot-adadirs.patch
deleted file mode 100644 (file)
index 15dd9e1..0000000
--- a/plplot-adadirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- plplot-5.11.1/cmake/modules/instdirs.cmake.orig    2016-03-10 21:57:48.161215537 +0100
-+++ plplot-5.11.1/cmake/modules/instdirs.cmake 2016-03-10 22:00:46.011208074 +0100
-@@ -100,11 +100,13 @@
- 
- # Ada source files (*.adb, *.ads) (following recommendations in
- # http://www.ada-france.org/debian/debian-ada-policy.html
--set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATADIR}/ada/adainclude/plplotada)
-+set(ADA_INCLUDE_PATH ${CMAKE_INSTALL_DATADIR}/ada/adainclude CACHE PATH "Ada include path")
-+set(ADA_INCLUDE_DIR ${ADA_INCLUDE_PATH}/plplotada)
- 
- # Ada library information files (*.ali) (following recommendations in
- # http://www.ada-france.org/debian/debian-ada-policy.html
--set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada)
-+set(ADA_LIB_PATH ${CMAKE_INSTALL_LIBDIR}/ada/adalib CACHE PATH "Ada library path")
-+set(ADA_LIB_DIR ${ADA_LIB_PATH}/plplotada)
- 
- # Drivers.
- set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers)

diff --git a/plplot-ocamldir.patch b/plplot-ocamldir.patch
deleted file mode 100644 (file)
index 07575cc..0000000
--- a/plplot-ocamldir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- plplot-5.9.9/bindings/ocaml/CMakeLists.txt.orig    2012-07-19 13:21:54.994034873 +0200
-+++ plplot-5.9.9/bindings/ocaml/CMakeLists.txt 2012-07-19 13:23:28.724031567 +0200
-@@ -40,7 +40,7 @@
-         elseif(DEP STREQUAL "qsastime")
-           set(internal_LIB_DIR "qsastime")
-         endif()
--        set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS} -cclib ${CMAKE_BINARY_DIR}/lib/${internal_LIB_DIR}/lib${DEP}.a)
-+        set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS} -cclib ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/${internal_LIB_DIR}/lib${DEP}.a)
-       elseif(DEP STREQUAL "general")
-         set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS})
-       else()
---- plplot-5.9.9/cmake/modules/ocaml.cmake~    2011-10-13 02:43:01.000000000 +0200
-+++ plplot-5.9.9/cmake/modules/ocaml.cmake     2012-07-19 13:29:30.017352156 +0200
-@@ -130,7 +130,7 @@
- 
-   # Installation follows the Debian ocaml policy for want of a better
-   # standard.
--  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml
-+  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ocaml
-     CACHE PATH "install location for ocaml files"
-     )
- 

diff --git a/plplot-octave.patch b/plplot-octave.patch
deleted file mode 100644 (file)
index 707ecbc..0000000
--- a/plplot-octave.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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)
-   file(WRITE ${CMAKE_BINARY_DIR}/octave_command
-   "printf(octave_config_info(\"localfcnfiledir\"));"
-   )
-@@ -249,9 +250,19 @@
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-   OUTPUT_VARIABLE _OCTAVE_M_DIR
-   )
-+  # Replace the OCTAVE_PREFIX with the PLplot prefix in OCTAVE_M_DIR
-+  string(REPLACE
-+  "${OCTAVE_PREFIX}" 
-+  "${CMAKE_INSTALL_PREFIX}"
-+  OCTAVE_M_DIR
-+  ${_OCTAVE_M_DIR}
-+  )
-+
-   #message(STATUS "_OCTAVE_M_DIR = ${_OCTAVE_M_DIR}")
-   file(TO_CMAKE_PATH ${_OCTAVE_M_DIR} _OCTAVE_M_DIR)
-   #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}"
--  "${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 ${CMAKE_INSTALL_LIBDIR}/octave)

diff --git a/plplot.spec b/plplot.spec
index bda04e8a771ec8836a8fbdbb4465539bb3e3d137..ec685b6c80610265cf0dded664b50d4db7472407 100644 (file)
--- a/plplot.spec
+++ b/plplot.spec
@@ -34,17 +34,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.12.0
-Release:       6
+Version:       5.14.0
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-# Source0-md5: 998a05be218e5de8f2faf988b8dbdc51
-Patch0:                %{name}-octave.patch
+# Source0-md5: 244883879f24a2324f536d624168870d
 Patch2:                %{name}-no-DISPLAY.patch
 Patch3:                %{name}-plmeta.patch
-Patch5:                %{name}-adadirs.patch
-Patch6:                %{name}-ocamldir.patch
 Patch7:                %{name}-d.patch
 URL:           http://plplot.sourceforge.net/
 BuildRequires: QtGui-devel >= 4
@@ -323,30 +320,32 @@ PLplot library - D binding.
 %description d-devel -l pl.UTF-8
 Biblioteka PLplot - wiązanie dla języka D.
 
-%package f95
+%package fortran
 Summary:       PLplot library - FORTRAN 95 binding
 Summary(pl.UTF-8):     Biblioteka PLplot - wiązanie dla języka FORTRAN 95
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     plplot-f95
 
-%description f95
+%description fortran
 PLplot library - FORTRAN 95 binding.
 
-%description f95 -l pl.UTF-8
+%description fortran -l pl.UTF-8
 Biblioteka PLplot - wiązanie dla języka FORTRAN 95.
 
-%package f95-devel
+%package fortran-devel
 Summary:       PLplot library - FORTRAN 95 binding development files
 Summary(pl.UTF-8):     Biblioteka PLplot - pliki programistyczne wiązania dla języka FORTRAN 95
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Requires:      %{name}-f95 = %{version}-%{release}
+Requires:      %{name}-fortran = %{version}-%{release}
 Requires:      gcc-fortran
+Obsoletes:     plplot-f95-devel
 
-%description f95-devel
+%description fortran-devel
 PLplot library - FORTRAN 95 binding development files.
 
-%description f95-devel -l pl.UTF-8
+%description fortran-devel -l pl.UTF-8
 Biblioteka PLplot - pliki programistyczne wiązania dla języka FORTRAN
 95.
 
@@ -622,11 +621,8 @@ Biblioteka PLplot - przykłady do wiązania dla Pythona.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
-%patch6 -p1
 %patch7 -p1
 
 %build
@@ -638,8 +634,8 @@ cd build
 %cmake .. \
 %if %{with ada}
        -DENABLE_ada=ON \
-       -DADA_INCLUDE_PATH=%{ada_incdir} \
-       -DADA_LIB_PATH=%{ada_objdir} \
+       -DADA_INCLUDE_DIR=%{ada_incdir} \
+       -DADA_LIB_DIR=%{ada_objdir} \
 %else
        -DENABLE_ada=OFF \
 %endif
@@ -659,17 +655,23 @@ cd build
 %endif
 %if %{with lua}
        -DENABLE_lua=ON \
-       -DLUA_EXECUTABLE=%{_bindir}/lua5.1 \
+       -DLUA_VERSION=5.1 \
+       -DREQUIRED_LUA_VERSION=5.1 \
 %else
        -DENABLE_lua=OFF \
 %endif
        -DENABLE_itcl=%{?with_itcl:ON}%{!?with_itcl:OFF} \
        -DENABLE_itk=%{?with_itcl:ON}%{!?with_itcl:OFF} \
-       -DENABLE_ocaml=%{?with_ocaml:ON}%{!?with_ocaml:OFF} \
+%if %{with ocaml}
+       -DENABLE_ocaml=ON \
+       -DOCAML_INSTALL_DIR=%{_libdir}/ocaml \
+%else
+       -DENABLE_ocaml=OFF \
+%endif
        -DENABLE_octave=%{?with_octave:ON}%{!?with_octave:OFF} \
        %{!?with_perl_pdl:-DENABLE_pdl=OFF} \
        -DENABLE_tk=ON \
-       -DF95_MOD_DIR=%{_includedir}/plplot \
+       -DFORTRAN_MOD_DIR=%{_includedir}/plplot \
        -DOCTAVE_INCLUDE_PATH=%{_includedir}/octave \
        -DOCTAVE_OCT_DIR=%{octave_oct_sitedir} \
        -DOCTAVE_M_DIR=%{octave_m_sitedir} \
@@ -679,8 +681,8 @@ cd build
        -DPLD_pdf=ON \
        %{?with_plmeta:-DPLD_plmeta=ON} \
        -DPLD_pstex=ON \
+       -DFORCE_PYTHON2=ON \
        -DPython_ADDITIONAL_VERSIONS=2.7 \
-       -DTRY_OCTAVE4=ON \
        -DUSE_INCRTCL_VERSION_4=ON \
        -DUSE_RPATH=OFF \
 %if %{with itcl}
@@ -703,7 +705,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-rm -rf installed-docs
+%{__rm} -rf installed-docs
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/plplot installed-docs
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
@@ -719,8 +721,8 @@ rm -rf $RPM_BUILD_ROOT
 %post  c++ -p /sbin/ldconfig
 %postun        c++ -p /sbin/ldconfig
 
-%post  f95 -p /sbin/ldconfig
-%postun        f95 -p /sbin/ldconfig
+%post  fortran -p /sbin/ldconfig
+%postun        fortran -p /sbin/ldconfig
 
 %post  ada -p /sbin/ldconfig
 %postun        ada -p /sbin/ldconfig
@@ -737,7 +739,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ABOUT AUTHORS ChangeLog.release Copyright FAQ NEWS PROBLEMS README README.release SERVICE ToDo
-%doc installed-docs/README.{1st.csa,1st.nn,csa,nn,drivers}
+%doc installed-docs/README.{csa,nn,drivers}
 %if %{with plmeta}
 %attr(755,root,root) %{_bindir}/plm2gif
 %attr(755,root,root) %{_bindir}/plpr
@@ -756,7 +758,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.14
+%attr(755,root,root) %ghost %{_libdir}/libplplot.so.16
 %if %{with plmeta}
 %{_mandir}/man1/plm2gif.1*
 %{_mandir}/man1/plpr.1*
@@ -787,7 +789,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/plplot%{version}/drivers/xfig.so
 %{_libdir}/plplot%{version}/drivers/xfig.driver_info
 %dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.pal
 %{_datadir}/plplot%{version}/*.fnt
 
@@ -847,8 +848,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/plplot/cd.h
 %{_includedir}/plplot/defines.h
 %endif
+%{_includedir}/plplot/csa.h
+%{_includedir}/plplot/csadll.h
 %{_includedir}/plplot/disptab.h
 %{_includedir}/plplot/drivers.h
+%{_includedir}/plplot/nn.h
+%{_includedir}/plplot/nndll.h
 %{_includedir}/plplot/pdf.h
 %{_includedir}/plplot/plConfig.h
 %{_includedir}/plplot/plDevs.h
@@ -887,7 +892,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libplplotcxx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplplotcxx.so.13
+%attr(755,root,root) %ghost %{_libdir}/libplplotcxx.so.14
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -907,17 +912,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_examplesdir}/%{name}-%{version}/d
 %endif
 
-%files f95
+%files fortran
 %defattr(644,root,root,755)
-%doc bindings/f95/README_array_sizes
-%attr(755,root,root) %{_libdir}/libplplotf95.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplplotf95.so.13
+%doc bindings/fortran/README_array_sizes
+%attr(755,root,root) %{_libdir}/libplplotfortran.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libplplotfortran.so.0
 
-%files f95-devel
+%files fortran-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libplplotf95.so
-%{_libdir}/libplf95demolib.a
-%{_includedir}/plplot/plf95demolib.mod
+%attr(755,root,root) %{_libdir}/libplplotfortran.so
+%{_libdir}/libplfortrandemolib.a
+%{_includedir}/plplot/plfortrandemolib.mod
 %{_includedir}/plplot/plplot_double.mod
 %{_includedir}/plplot/plplot_graphics.mod
 %{_includedir}/plplot/plplot.mod
@@ -925,21 +930,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/plplot/plplot_private_utilities.mod
 %{_includedir}/plplot/plplot_single.mod
 %{_includedir}/plplot/plplot_types.mod
-%{_pkgconfigdir}/plplot-f95.pc
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/test_f95.sh
-%{_examplesdir}/%{name}-%{version}/f95
+%{_pkgconfigdir}/plplot-fortran.pc
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/test_fortran.sh
+%{_examplesdir}/%{name}-%{version}/fortran
 
 %if %{with ada}
 %files ada
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libplplotada.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplplotada.so.2
+%attr(755,root,root) %ghost %{_libdir}/libplplotada.so.4
 
 %files ada-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libplplotada.so
-%{ada_objdir}/plplotada
-%{ada_incdir}/plplotada
+%{ada_objdir}/plplot_*.ali
+%{ada_incdir}/plplot*.ad*
 %{_pkgconfigdir}/plplot-ada.pc
 %{_examplesdir}/%{name}-%{version}/ada
 %attr(755,root,root) %{_examplesdir}/%{name}-%{version}/test_ada.sh
@@ -948,7 +953,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files java
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/plplotjavac_wrap.so
+%attr(755,root,root) %{_libdir}/libplplotjavac_wrap.so
 %{_javadir}/plplot.jar
 
 %files java-devel
@@ -962,7 +967,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pltcl
 %attr(755,root,root) %{_bindir}/plserver
 %attr(755,root,root) %{_libdir}/libplplottcltk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplplottcltk.so.13
+%attr(755,root,root) %ghost %{_libdir}/libplplottcltk.so.14
 %attr(755,root,root) %{_libdir}/libtclmatrix.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtclmatrix.so.10
 %attr(755,root,root) %{_libdir}/libplplottcltk_Main.so.*.*.*
@@ -1014,7 +1019,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc bindings/octave/{BUGS,FGA,README,ToDo,USAGE}
 %attr(755,root,root) %{octave_oct_sitedir}/plplot_octave.oct
-%{octave_m_sitedir}/PLplot
+%{octave_m_sitedir}/*.m
 %{_datadir}/plplot_octave
 %attr(755,root,root) %{_examplesdir}/%{name}-%{version}/test_octave_interactive.sh
 
@@ -1044,6 +1049,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/plplot/libplplot_stubs.a
 %{_libdir}/ocaml/plplot/plplot.cma
 %{_libdir}/ocaml/plplot/plplot.cmi
+%{_libdir}/ocaml/plplot/plplot.cmx
 %{_libdir}/ocaml/plplot/plplot.mli
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/plplot/plplot.a
@@ -1074,9 +1080,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-plplot
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_plplotcmodule.so
-%attr(755,root,root) %{py_sitedir}/plplot_widgetmodule.so
+%attr(755,root,root) %{py_sitedir}/_Pltk_init.so
+%attr(755,root,root) %{py_sitedir}/_plplotc.so
 %{py_sitedir}/Plframe.py[co]
+%{py_sitedir}/Pltk_init.py[co]
 %{py_sitedir}/plplotc.py[co]
 %{py_sitedir}/plplot.py[co]
 %{py_sitedir}/TclSup.py[co]