commit qwtplot3d for openSUSE:Factory

2 May 2019

Hello community,

here is the log from the commit of package qwtplot3d for openSUSE:Factory checked in at 2019-05-02 19:18:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qwtplot3d (Old)
 and      /work/SRC/openSUSE:Factory/.qwtplot3d.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qwtplot3d"

Thu May  2 19:18:16 2019 rev:2 rq:699673 version:0.2.7+git20190410.a6d0890d

Changes:
--------
--- /work/SRC/openSUSE:Factory/qwtplot3d/qwtplot3d.changes	2017-08-28 15:32:58.571387134 +0200
+++ /work/SRC/openSUSE:Factory/.qwtplot3d.new.5148/qwtplot3d.changes	2019-05-02 19:18:26.145540074 +0200
@@ -1,0 +2,10 @@
+Sat Apr 27 12:59:02 UTC 2019 - christophe@krop.fr
+
+- Update to version 0.2.7+git20190410.a6d0890d
+  Switch to a git snapshot. This version supports Qt5 which is
+  required to build scidavis 1.25.
+- Drop glu_include.patch
+- Drop qwtplot3d-gcc43.patch
+- Add build_a_shared_lib.patch to build shared library.
+
+-------------------------------------------------------------------

Old:
----
  glu_include.patch
  qwtplot3d-0.2.7.tar.bz2
  qwtplot3d-gcc43.patch

New:
----
  _service
  _servicedata
  build_a_shared_lib.patch
  qwtplot3d-0.2.7+git20190410.a6d0890d.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qwtplot3d.spec ++++++
--- /var/tmp/diff_new_pack.yJdg1z/_old	2019-05-02 19:18:26.773541216 +0200
+++ /var/tmp/diff_new_pack.yJdg1z/_new	2019-05-02 19:18:26.777541223 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package qwtplot3d
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,41 +12,41 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define		soname		0
 Name:           qwtplot3d
-Version:        0.2.7
+Version:        0.2.7+git20190410.a6d0890d
 Release:        0
 Summary:        A feature-rich Qt/OpenGL-based C++ programming library
 License:        Zlib
 Group:          Development/Libraries/C and C++
-Url:            http://qwtplot3d.sourceforge.net/
-Source:         qwtplot3d-%{version}.tar.bz2
-# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch0:         qwtplot3d-gcc43.patch
-# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch1:         glu_include.patch
+URL:            https://github.com/copasi/copasi-dependencies/tree/master/src/qwtplot3d-qt4
+Source:         %{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE
+Patch0:         build_a_shared_lib.patch
 BuildRequires:  Mesa-devel
-BuildRequires:  dos2unix
-%if 0%{?suse_version} > 1220
-BuildRequires:  glu-devel
-%endif
-BuildRequires:  qt-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  cmake
+BuildRequires:  pkgconfig
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5OpenGL)
+BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++
 programming library. It provides essentially a bunch of 3D widgets
 for programmers.
 
-%package -n lib%{name}%{soname}
+%package -n libqwtplot3d-qt5-%{soname}
 Summary:        Shared library containing the QwtPlot3D Widget set
 Group:          System/Libraries
 
-%description -n lib%{name}%{soname}
+%description -n libqwtplot3d-qt5-%{soname}
 QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++
 programming library. It provides essentially a bunch of 3D widgets
 for programmers.
@@ -54,50 +54,37 @@
 %package devel
 Summary:        Development tools for programs which uses QwtPlot3D Widget set
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name}%{soname} = %{version}
-Requires:       qt-devel
+Requires:       libqwtplot3d-qt5-%{soname} = %{version}
 
 %description devel
 QwtPlot3D is a feature-rich Qt/OpenGL-based C++ programming library.
 It provides essentially a bunch of 3D widgets for programmers.
 
 %prep
-%setup -q -n qwtplot3d
+%setup -q
 %patch0 -p1
-%patch1 -p0
-dos2unix COPYING
-find examples -type f -exec dos2unix {} +
 
 %build
-qmake qwtplot3d.pro -o Makefile
-make %{?_smp_mflags}
+%cmake -DSELECT_QT=Qt5 \
+  -DWITH_ZLIB=ON \
+  -DCMAKE_INSTALL_INCLUDEDIR=%{_libqt5_includedir}/%{name}
+
+%make_jobs
 
 %install
-mkdir -p %{buildroot}%{_includedir}/qwtplot3d
-mkdir -p %{buildroot}%{_libdir}
-for n in include/*.h ; do
-    install -m 644 $n %{buildroot}%{_includedir}/qwtplot3d
-done
-# install, preserving links
-chmod 644 lib/libqwtplot3d.so*
-for n in lib/libqwtplot3d.so* ; do
-    cp -d $n %{buildroot}%{_libdir}
-done
-
-%post -n lib%{name}%{soname} -p /sbin/ldconfig
-
-%postun -n lib%{name}%{soname} -p /sbin/ldconfig
-
-%files -n lib%{name}%{soname}
-%defattr(-,root,root)
-%doc COPYING
-%{_libdir}/lib%{name}.so.*
+%cmake_install
+
+%post -n libqwtplot3d-qt5-%{soname} -p /sbin/ldconfig
+%postun -n libqwtplot3d-qt5-%{soname} -p /sbin/ldconfig
+
+%files -n libqwtplot3d-qt5-%{soname}
+%license COPYING
+%{_libdir}/libqwtplot3d-qt5.so.*
 
 %files devel
-%defattr(-,root,root)
-%doc COPYING examples
-%{_libdir}/lib%{name}.so
-%dir %{_includedir}/qwtplot3d
-%{_includedir}/qwtplot3d/qwt3d*.h
+%license COPYING
+%doc examples
+%{_libdir}/libqwtplot3d-qt5.so
+%{_libqt5_includedir}/qwtplot3d/
 
 %changelog

++++++ _service ++++++
<services>
  <service mode="disabled" name="tar_scm">
    <param name="changesgenerate">enable</param>
    <param name="versionformat">0.2.7+git%cd.%h</param>
    <param name="url">https://github.com/copasi/copasi-dependencies</param>
    <param name="subdir">src/qwtplot3d-qt4</param>
    <param name="scm">git</param>
    <param name="filename">qwtplot3d</param>
  </service>
  <service mode="disabled" name="recompress">
    <param name="file">*.tar</param>
    <param name="compression">xz</param>
  </service>
  <service mode="disabled" name="set_version"/>
</services> 
++++++ _servicedata ++++++
<servicedata>
  <service name="tar_scm">
    <param name="url">https://github.com/copasi/copasi-dependencies</param>
    <param name="changesrevision">527adc603a454aefbfd87ecb998f56ed3b6359ab</param>
  </service>
</servicedata>
++++++ build_a_shared_lib.patch ++++++

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 312690d..334bf30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,16 +171,22 @@ endif()
 set(SOURCES ${SOURCES} ${MOC_FILES})
 
 
-add_library(qwtplot3d STATIC ${SOURCES} ${HEADERS})
-QT_BIND_TO_TARGET(qwtplot3d)
+add_library(qwtplot3d-qt5 SHARED ${SOURCES} ${HEADERS})
+QT_BIND_TO_TARGET(qwtplot3d-qt5)
+
+target_link_libraries(qwtplot3d-qt5 GL GLU)
 
 if (ZLIB_FOUND)
-target_link_libraries(qwtplot3d ${ZLIB_LIBRARIES})
+target_link_libraries(qwtplot3d-qt5 ${ZLIB_LIBRARIES})
 endif(ZLIB_FOUND)
 
+set_target_properties(qwtplot3d-qt5 PROPERTIES
+  VERSION 0.2.7
+  SOVERSION 0
+)
 
 install(FILES ${HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-INSTALL(TARGETS qwtplot3d 
+INSTALL(TARGETS qwtplot3d-qt5
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")

    

root

tags

participants (1)