Accepting request 186830 from KDE:Distro:Factory

As an addition to the previous submission, now we have a conflict between the two designer packages (qwt and qwt6), so that only one can be installed.

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

qwt-6.0.2.tar.bz2

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

qwt-6.1.0-rpath.patch

@@ -0,0 +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 @@
+         # 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}
+ 
+         contains(QWT_CONFIG, QwtFramework) {
+ 

qwt-6.1.0.tar.bz2

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

qwt6.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Aug 12 18:33:05 UTC 2013 - tittiatcoke@gmail.com
+
+- qwt6-designer is now conflicting with qwt-designer.
+
+-------------------------------------------------------------------
+Fri Aug  9 15:36:51 UTC 2013 - dap.darkness@gmail.com
+
+- Update to Qwt 6.1.0
+  * New plot items
+  * Scales beyond linear and logarithmic transformations
+  * Datetime scales
+  * Redesign of the dial and meter widgets
+  * Basic support for an OpenGL plot canvas
+  * A new system for plot legends
+  * Off-screen paint device for vector graphics
+  * Changes and improvements to several classes
+- Added qwt-6.1.0-rpath.patch to prevent
+  https://sourceforge.net/p/qwt/bugs/191
+- Qmake debug info stripping was disabled.
+
 -------------------------------------------------------------------
 Mon Jan 28 16:30:49 EET 2013 - koprok@nand.bg
 

qwt6.spec

@@ -17,13 +17,17 @@
 
 
 Name:           qwt6
-Version:        6.0.2
+Version:        6.1.0
 Release:        0
 Summary:        Qt Widgets for Technical Applications
 License:        SUSE-QWT-1.0
 Group:          Development/Libraries/C and C++
 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
+
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
@@ -86,6 +90,7 @@ This package contains example programs demonstrating the Qwt widgets.
 %package designer
 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
@@ -108,6 +113,7 @@ as is it created by doxygen.
 
 %prep
 %setup -q -n qwt-%{version}
+%patch0
 
 %build
 %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
@@ -119,6 +125,7 @@ export PATH=/usr/lib/qt4/bin/:$PATH
 
 # Now build the qwt6 library
 qmake \
+	QMAKE_STRIP="" \
 	QWT_INSTALL_PREFIX=%{_prefix} \
 	CONFIG+=QwtDll CONFIG+=QwtDesigner CONFIG+=QwtExamples -after \
 	QMAKE_CXXFLAGS="%{optflags}" \
@@ -135,7 +142,7 @@ make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot}
 
 # Documentation
 mkdir -p %{buildroot}%{_docdir}/%{name}
-cp COPYING CHANGES README %{buildroot}%{_docdir}/%{name}
+cp COPYING README %{buildroot}%{_docdir}/%{name}
 cp -r examples %{buildroot}%{_docdir}/%{name}/examples
 
 # Designer plugin