Update to 6.1.4

5 years ago · 1408bc350c
parent bbdbd9e6e8
commit 1408bc350c
7 changed files with 26 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 /qwt-6.1.2.tar.bz2
 /qwt-6.1.3.tar.bz2
+/qwt-6.1.4.tar.bz2
--- a/qwt-6.1.1-pkgconfig.patch
+++ b/qwt-6.1.1-pkgconfig.patch
@ -1,6 +1,6 @@
-diff -up qwt-6.1.1/textengines/mathml/mathml.pro.pkgconfig qwt-6.1.1/textengines/mathml/mathml.pro
--- qwt-6.1.1/textengines/mathml/mathml.pro.pkgconfig	2014-09-18 09:59:46.613028743 -0500
-+++ qwt-6.1.1/textengines/mathml/mathml.pro	2014-09-20 14:15:54.962624868 -0500
+diff -rupN --no-dereference qwt-6.1.4/textengines/mathml/mathml.pro qwt-6.1.4-new/textengines/mathml/mathml.pro
+--- qwt-6.1.4/textengines/mathml/mathml.pro	2019-01-02 17:21:31.504466243 +0100
+++ qwt-6.1.4-new/textengines/mathml/mathml.pro	2020-01-06 17:17:19.695623736 +0100
@@ -60,6 +60,8 @@ contains(QWT_CONFIG, QwtPkgConfig) {
 
     QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
--- a/qwt-6.1.2-qt_install_paths.patch
+++ b/qwt-6.1.2-qt_install_paths.patch
@ -1,9 +1,8 @@
-diff -up qwt-6.1.2/designer/designer.pro.qt_install_paths qwt-6.1.2/designer/designer.pro
-diff -up qwt-6.1.2/qwtbuild.pri.qt_install_paths qwt-6.1.2/qwtbuild.pri
--- qwt-6.1.2/qwtbuild.pri.qt_install_paths	2014-12-11 08:13:13.509186492 -0600
-+++ qwt-6.1.2/qwtbuild.pri	2014-12-12 20:41:50.128472485 -0600
+diff -rupN --no-dereference qwt-6.1.4/qwtbuild.pri qwt-6.1.4-new/qwtbuild.pri
+--- qwt-6.1.4/qwtbuild.pri	2019-01-02 17:21:31.556467499 +0100
+++ qwt-6.1.4-new/qwtbuild.pri	2020-01-06 17:17:19.790623764 +0100
@@ -14,8 +14,7 @@
- CONFIG           += qt     
+ CONFIG           += qt
 CONFIG           += warn_on
 CONFIG           += no_keywords
 -CONFIG           += silent
@ -12,9 +11,9 @@ diff -up qwt-6.1.2/qwtbuild.pri.qt_install_paths qwt-6.1.2/qwtbuild.pri
 ######################################################################
 # release/debug mode
 ######################################################################
-diff -up qwt-6.1.2/qwtconfig.pri.qt_install_paths qwt-6.1.2/qwtconfig.pri
--- qwt-6.1.2/qwtconfig.pri.qt_install_paths	2014-12-11 08:13:13.513186492 -0600
-+++ qwt-6.1.2/qwtconfig.pri	2014-12-12 20:43:02.394738555 -0600
+diff -rupN --no-dereference qwt-6.1.4/qwtconfig.pri qwt-6.1.4-new/qwtconfig.pri
+--- qwt-6.1.4/qwtconfig.pri	2019-01-02 17:21:31.556467499 +0100
+++ qwt-6.1.4-new/qwtconfig.pri	2020-01-06 17:17:19.790623764 +0100
@@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
 
@ -48,7 +47,7 @@ diff -up qwt-6.1.2/qwtconfig.pri.qt_install_paths qwt-6.1.2/qwtconfig.pri
 # linux distributors often organize the Qt installation
 # their way and QT_INSTALL_PREFIX doesn't offer a good
@@ -63,8 +64,8 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
- # with every Qt upgrade. 
+ # with every Qt upgrade.
 ######################################################################
 
 -QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
@ -66,4 +65,4 @@ diff -up qwt-6.1.2/qwtconfig.pri.qt_install_paths qwt-6.1.2/qwtconfig.pri
 +QWT_CONFIG     += QwtMathML
 
 ######################################################################
- # If you want to build the Qwt designer plugin, 
+ # If you want to build the Qwt designer plugin,
--- a/qwt-6.1.3-no_rpath.patch
+++ b/qwt-6.1.3-no_rpath.patch
@ -1,7 +1,7 @@
-diff -up qwt-6.1.3/designer/designer.pro.no_rpath qwt-6.1.3/designer/designer.pro
--- qwt-6.1.3/designer/designer.pro.no_rpath	2016-06-13 02:14:23.019600853 -0500
-+++ qwt-6.1.3/designer/designer.pro	2017-03-08 12:11:49.591323453 -0600
-@@ -83,7 +83,7 @@ contains(QWT_CONFIG, QwtDesigner) {
+diff -rupN --no-dereference qwt-6.1.4/designer/designer.pro qwt-6.1.4-new/designer/designer.pro
+--- qwt-6.1.4/designer/designer.pro	2019-01-02 17:21:31.544467209 +0100
+++ qwt-6.1.4-new/designer/designer.pro	2020-01-06 17:17:19.964623815 +0100
+@@ -98,7 +98,7 @@ contains(QWT_CONFIG, QwtDesigner) {
         # compile the path for finding the Qwt library
         # into the plugin. Not supported on Windows !
 
--- a/qwt-qt5.patch
+++ b/qwt-qt5.patch
@ -1,6 +1,6 @@
-diff -up qwt-6.1.2/qwtfunctions.pri.qt5 qwt-6.1.2/qwtfunctions.pri
--- qwt-6.1.2/qwtfunctions.pri.qt5	2014-12-11 08:13:13.511186492 -0600
-+++ qwt-6.1.2/qwtfunctions.pri	2014-12-12 20:45:24.556261966 -0600
+diff -rupN --no-dereference qwt-6.1.4/qwtfunctions.pri qwt-6.1.4-new/qwtfunctions.pri
+--- qwt-6.1.4/qwtfunctions.pri	2019-01-02 17:21:31.552467404 +0100
+++ qwt-6.1.4-new/qwtfunctions.pri	2020-01-06 17:17:19.882623791 +0100
@@ -12,7 +12,12 @@
 defineReplace(qwtLibraryTarget) {
 
--- a/qwt.spec
+++ b/qwt.spec
@ -11,8 +11,8 @@

 Name:    qwt
 Summary: Qt Widgets for Technical Applications
-Version: 6.1.3
-Release: 12%{?dist}
+Version: 6.1.4
+Release: 1%{?dist}

 License: LGPLv2 with exceptions
 URL:     http://qwt.sourceforge.net
@ -158,7 +158,6 @@ mv %{buildroot}%{_qt5_docdir}/html/man/man3 \
 %license COPYING
 %doc README
 %{_qt4_libdir}/libqwt.so.6*
-%{?_qt4_plugindir}/designer/libqwt_designer_plugin.so
 # subpkg ? -- rex
 %{_qt4_libdir}/libqwtmathml.so.6*

@ -207,6 +206,9 @@ mv %{buildroot}%{_qt5_docdir}/html/man/man3 \


 %changelog
+* Mon Jan 06 2020 Sandro Mani <manisandro@gmail.com> - 6.1.4-1
+- Update to 6.1.4
+
 * Sat Nov 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 6.1.3-12
 - make qt4 conditional, no on el8+ (#1773581)

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qwt-6.1.3.tar.bz2) = d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
+SHA512 (qwt-6.1.4.tar.bz2) = 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da