Accepting request 285557 from KDE:Distro:Factory

1

OBS-URL: https://build.opensuse.org/request/show/285557
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qwt6?expand=0&rev=9

qwt-6.1.0.tar.bz2

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

qwt-6.1.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c
+size 3528935

qwt-rpath.patch

@@ -1,11 +1,11 @@
 --- designer/designer.pro.orig	2013-08-09 18:24:58.656000009 +0300
 +++ designer/designer.pro	2013-08-09 18:24:58.666000009 +0300
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
          # compile the path for finding the Qwt library
          # into the plugin. Not supported on Windows !
  
 -        QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
 +#         QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
+         qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
  
-         contains(QWT_CONFIG, QwtFramework) {
- 
+         contains(QWT_CONFIG, QwtDll) {

qwt6.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb  4 18:46:59 UTC 2015 - dap.darkness@gmail.com
+
+- Update to Qwt 6.1.2
+  * fixes at QwtPlot, color maps, controls and scales.
+- Removed Mandriva support.
+- Renamed qwt-6.1.0-rpath.patch to qwt-rpath.patch
+  because upstream doesn't want merge it. Updated.
+
 -------------------------------------------------------------------
 Mon Aug 12 18:33:05 UTC 2013 - tittiatcoke@gmail.com
 

qwt6.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qwt6
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,7 +17,7 @@
 
 
 Name:           qwt6
-Version:        6.1.0
+Version:        6.1.2
 Release:        0
 Summary:        Qt Widgets for Technical Applications
 License:        SUSE-QWT-1.0
@@ -26,17 +26,13 @@ Url:            http://qwt.sourceforge.net/
 Source:         http://switch.dl.sourceforge.net/sourceforge/qwt/qwt-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE to prevent 'ERROR: RPATH "/usr/local/qwt-6.1.0/lib" on
 # /usr/lib(64)/qt4/plugins/designer/libqwt_designer_plugin.so is not allowed'.
-Patch0:         qwt-6.1.0-rpath.patch
+Patch0:         qwt-rpath.patch
 
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?mandriva_version} || 0%{?mdkversion}
-BuildRequires:  libqt-devel
-%else
 BuildRequires:  qt-devel
-%endif
 %if 0%{?suse_version} >= 1100
 BuildRequires:  fdupes
 %endif
@@ -64,11 +60,7 @@ Requires:       %{name} = %{version}
 Requires:       freetype2-devel
 Requires:       gcc-c++
 Requires:       libpng-devel
-%if 0%{?mandriva_version} || 0%{?mdkversion}
-Requires:       libqt-devel
-%else
 Requires:       qt-devel
-%endif
 %if 0%{?suse_version}
 Recommends:     %{name}-devel-doc
 Recommends:     %{name}-examples
@@ -92,11 +84,7 @@ Summary:        Plugin for the Qt Interface designer
 Group:          Development/Tools/GUI Builders
 Conflicts:      qwt-designer
 Requires:       %{name}-devel = %{version}
-%if 0%{?mandriva_version} || 0%{?mdkversion}
-Requires:       libqt-devel
-%else
 Requires:       qt-devel
-%endif
 
 %description designer
 The %{name}-designer package contains the plugin for the Qt User Interface
@@ -119,9 +107,6 @@ as is it created by doxygen.
 %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 export PATH=%{_libdir}/qt4/bin/:$PATH
 %endif
-%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800
-export PATH=/usr/lib/qt4/bin/:$PATH
-%endif
 
 # Now build the qwt6 library
 qmake \
@@ -146,13 +131,8 @@ cp COPYING README %{buildroot}%{_docdir}/%{name}
 cp -r examples %{buildroot}%{_docdir}/%{name}/examples
 
 # Designer plugin
-%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800
-mkdir -p %{buildroot}/%{_prefix}/lib/qt4/plugins/designer
-mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_prefix}/lib/qt4/plugins/designer/
-%else
 mkdir -p %{buildroot}/%{_libdir}/qt4/plugins/designer
 mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_libdir}/qt4/plugins/designer/
-%endif
 
 %if 0%{?suse_version} >= 1100
 %fdupes %{buildroot}
@@ -175,11 +155,7 @@ mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_libdir}/
 
 %files designer
 %defattr(-,root,root)
-%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800
-%{_prefix}/lib/qt4/plugins/designer/libqwt_designer_plugin.so
-%else
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
-%endif
 
 %files devel
 %defattr(-,root,root)