Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2024-04-10 17:49:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new.29460 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Wed Apr 10 17:49:49 2024 rev:73 rq:1166596 version:5.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2023-06-30 19:58:49.261625192 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new.29460/plplot.changes 2024-04-10 17:50:43.533213670 +0200 @@ -1,0 +2,14 @@ +Mon Apr 8 05:34:11 UTC 2024 - Atri Bhattacharya <badshah...@gmail.com> + +- Disable python3.12 as it is not supported by upstream. +- Fix doc pakcage location. + +------------------------------------------------------------------- +Fri Jan 26 21:57:04 UTC 2024 - Atri Bhattacharya <badshah...@gmail.com> + +- Add plplot-pkgconfig-includedir.patch: Use + CMAKE_INSTALL_FULL_<dir> macros to fix incorrect include and lib + dirs in pkgconfig file + (https://sourceforge.net/p/plplot/bugs/207/). + +------------------------------------------------------------------- New: ---- plplot-pkgconfig-includedir.patch BETA DEBUG BEGIN: New: - Add plplot-pkgconfig-includedir.patch: Use CMAKE_INSTALL_FULL_<dir> macros to fix incorrect include and lib BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.tg1Vqh/_old 2024-04-10 17:50:44.889263574 +0200 +++ /var/tmp/diff_new_pack.tg1Vqh/_new 2024-04-10 17:50:44.893263721 +0200 @@ -1,7 +1,7 @@ # # spec file for package plplot # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,8 +55,7 @@ %define wx_shlib libplplotwxwidgets1 # DONT SPLIT OUT plplot-tcltk-libs INTO INDIVIDUAL SHARED LIBS AS THEY ARE ALL REQUIRED TOGETHER AND THEIR SO NUMBERING CHANGE IN-STEP WITH EACH OTHER -# Until we have sip for python 3.11 -#%%define pythons python310 +%define skip_python312 1 Name: plplot Version: 5.15.0 @@ -80,6 +79,8 @@ Patch5: support-python3-pythondemos.patch # PATCH-FIX-UPSTREAM plplot-libharu-version-check.patch badshah...@gmail.com -- Include correct header for libharu version checks Patch6: plplot-libharu-version-check.patch +# PATCH-FIX-UPSTREAM plplot-pkgconfig-includedir.patch badshah...@gmail.com -- Fix includedir in pkgconfig files +Patch7: plplot-pkgconfig-includedir.patch # List based on build_ada in gcc.spec ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le s390 s390x ia64 aarch64 riscv64 BuildRequires: cmake >= 3.13.2 @@ -232,12 +233,6 @@ This package provides the files necessary for development with PLplot in C. -%post devel -/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir - -%preun devel -/sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir - %files devel -f %{_builddir}/%{name}.filelist.ocaml %license COPYING.LIB Copyright %doc AUTHORS FAQ README README.release @@ -1109,6 +1104,9 @@ %{python_expand #Set the $python var # Define cmake common opts export CMAKE_COMMON_OPTS="-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ +-DDOC_DIR:PATH=%{_docdir}/%{name}-doc \ +-DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ +-DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \ -DENABLE_compiler_diagnostics=ON \ -DPL_FREETYPE_FONT_PATH:PATH=\"%{_datadir}/fonts/truetype\" \ -DUSE_RPATH:BOOL=OFF \ @@ -1214,10 +1212,6 @@ rm -f %{buildroot}%{_datadir}/plplot%{version}/examples/CMakeLists.txt rm -fr %{buildroot}%{_datadir}/plplot%{version}/examples/cmake -#Move doc files to appropriate location -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}-doc - %if %{tk_enabled} #Grant executable permissions to example tk binaries with valid shebang chmod +x %{buildroot}%{_datadir}/%{name}%{version}/examples/tk/tk03 ++++++ plplot-pkgconfig-includedir.patch ++++++ Index: plplot-5.15.0/pkgcfg/plplot-template.pc.in =================================================================== --- plplot-5.15.0.orig/pkgcfg/plplot-template.pc.in +++ plplot-5.15.0/pkgcfg/plplot-template.pc.in @@ -1,6 +1,6 @@ -libdir=@LIB_DIR@ -includedir=@INCLUDE_DIR@ -drvdir=@LIB_DIR@/plplot@PLPLOT_VERSION@/drivers +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +drvdir=@CMAKE_INSTALL_FULL_LIBDIR@/plplot@PLPLOT_VERSION@/drivers Name: PLplot @PC_SHORT_NAME@ Description: Scientific plotting library (@PC_PRECISION@@PC_LONG_NAME@) Index: plplot-5.15.0/CMakeLists.txt =================================================================== --- plplot-5.15.0.orig/CMakeLists.txt +++ plplot-5.15.0/CMakeLists.txt @@ -95,6 +95,8 @@ endif(POLICY CMP0086) # install trees. set(PROJECT_NAMESPACE PLPLOT::) +include(GNUInstallDirs) + option(USE_WRITEABLE_TARGET_TEST_PREFIX "Option to test library and executable targets which have both writeable and (ALIASed namespaced) read-only versions of their targets in the build tree and namespaced read-only targets in the install tree. This test prepends a prefix to the writeable version of the target name so as a result any such target referred to in the build tree without a writeable (\"writeable_target_test_prefix_)\") or read-only (\"PLPLOT::\") prefix should be discovered by this test (N.B. unless the unprefixed target reference occurs in CMake logic branches that are unexecuted by the particular configuration options that are chosen which makes this test necessary but not sufficient)." OFF) if(USE_WRITEABLE_TARGET_TEST_PREFIX) set(WRITEABLE_TARGET writeable_target_test_prefix_)
