Accepting request 907266 from home:cgiboudeaux:branches:devel:libraries:c_c++

- Update to 6.2.0 (boo#1187996)
  * MathML text renderer removed
  * Class Includes added
  * BSD License for examples
  * Spline interpolation
  * New plot items
- Check the installed CHANGES-6.2 file for the complete list
  of changes.
- Drop qwt-6.1.3-pkgconfig.patch. No longer needed
- Rebase qwt-6.1.4-mkspecs.patch

OBS-URL: https://build.opensuse.org/request/show/907266
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=13

qwt-6.1.3-pkgconfig.patch

@@ -1,13 +0,0 @@
-diff -ruN qwt-6.1.3.orig/textengines/mathml/mathml.pro qwt-6.1.3/textengines/mathml/mathml.pro
---- qwt-6.1.3.orig/textengines/mathml/mathml.pro	2016-06-13 10:14:22.990600268 +0300
-+++ qwt-6.1.3/textengines/mathml/mathml.pro	2017-04-20 23:52:55.654701571 +0300
-@@ -60,7 +60,8 @@
- 
-     QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
-     QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
--
-+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+    
-     # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
-     # with including pri files: better don't use it
- 

qwt-6.1.4-mkspecs.patch

@@ -0,0 +1,43 @@
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 0b054e0..63301e6 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -28,9 +28,9 @@ win32 {
+     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
+ }
+ 
+-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_DOCS      = $$[QT_INSTALL_DOCS]/qwt6
++QWT_INSTALL_HEADERS   = $$[QT_INSTALL_HEADERS]/qwt6
++QWT_INSTALL_LIBS      = $$[QT_INSTALL_LIBS]
+ 
+ ######################################################################
+ # Designer plugin
+@@ -42,14 +42,12 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+ # runtime environment of designer/creator.
+ ######################################################################
+ 
+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+-
+ # linux distributors often organize the Qt installation
+ # their way and QT_INSTALL_PREFIX doesn't offer a good
+ # path. Also QT_INSTALL_PREFIX is only one of the default
+ # search paths of the designer - not the Qt creator
+ 
+-#QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PREFIX]/plugins/designer
++QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer
+ 
+ ######################################################################
+ # Features
+@@ -63,8 +61,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+ # with every Qt upgrade.
+ ######################################################################
+ 
+-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
++QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features
+ 
+ ######################################################################
+ # Build the static/shared libraries.

qwt-6.1.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6
-size 4306402

qwt-6.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
+size 4815773

qwt6.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jul 20 07:16:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 6.2.0 (boo#1187996)
+  * MathML text renderer removed
+  * Class Includes added
+  * BSD License for examples
+  * Spline interpolation
+  * New plot items
+- Check the installed CHANGES-6.2 file for the complete list
+  of changes.
+- Drop qwt-6.1.3-pkgconfig.patch. No longer needed
+- Rebase qwt-6.1.4-mkspecs.patch
+
 -------------------------------------------------------------------
 Tue Apr 13 07:44:53 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
 

qwt6.spec

@@ -16,9 +16,9 @@
 #
 
 
-%define sover   6
+%define sover   6_2
 Name:           qwt6
-Version:        6.1.6
+Version:        6.2.0
 Release:        0
 Summary:        Qt5 Widgets for Technical Applications
 License:        SUSE-QWT-1.0
@@ -28,10 +28,8 @@ Source:         https://sourceforge.net/projects/qwt/files/qwt/%{version}/qwt-%{
 # PATCH-FIX-OPENSUSE to prevent 'ERROR: RPATH "/usr/local/qwt-6.1.0/lib" on
 # /usr/lib(64)/qt(4,5)/plugins/designer/libqwt_designer_plugin.so is not allowed'.
 Patch0:         qwt-6.1.3-rpath.patch
-# PATCH-FIX-OPENSUSE pkgconfig.patch -- Create and install pc files for pkg-config
-Patch2:         qwt-6.1.3-pkgconfig.patch
 # PATCH-FIX-OPENSUSE mkspecs.patch -- Use established settings for the .pc files
-Patch3:         qwt-6.1.4-mkspecs.patch
+Patch2:         qwt-6.1.4-mkspecs.patch
 BuildRequires:  fdupes
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
@@ -120,10 +118,7 @@ This package contains the development documentation of the Qwt(Qt5) widgets
 as is it created by doxygen.
 
 %prep
-%setup -q -n qwt-%{version}
+%autosetup -p1 -n qwt-%{version}
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 mkdir build
@@ -170,7 +165,7 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \
 %{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc
 %{_libqt5_archdatadir}/mkspecs/features/
 %dir %{_libqt5_includedir}/qwt6
-%{_libqt5_includedir}/qwt6/*.h
+%{_libqt5_includedir}/qwt6/*
 %{_mandir}/man?/*.3%{ext_info}
 
 %files examples