From e24102d6b8fd3883e2fedc8c150b4e7b3a5acc473c952e43bf46df6847119713 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Tue, 27 Jul 2021 10:24:07 +0000 Subject: [PATCH] Accepting request 908531 from home:DarkSS:branches:network - Rollback previous changes. - Moved *.so.? & *.so.?.? to the devel subpackage. - Added BSD-3-Clause for examples subpackage (6.2.0 changes). OBS-URL: https://build.opensuse.org/request/show/908531 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/qwt6?expand=0&rev=15 --- qwt6.changes | 7 +++++++ qwt6.spec | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/qwt6.changes b/qwt6.changes index 53cd369..a19422c 100644 --- a/qwt6.changes +++ b/qwt6.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 27 08:07:52 UTC 2021 - Dmitriy Perlow + +- Rollback previous changes. +- Moved *.so.? & *.so.?.? to the devel subpackage. +- Added BSD-3-Clause for examples subpackage (6.2.0 changes). + ------------------------------------------------------------------- Wed Jul 21 08:06:44 UTC 2021 - Luigi Baldoni diff --git a/qwt6.spec b/qwt6.spec index 4a49f93..9863d91 100644 --- a/qwt6.spec +++ b/qwt6.spec @@ -17,7 +17,6 @@ %define sover 6_2 -%define oldver 6_0 Name: qwt6 Version: 6.2.0 Release: 0 @@ -52,7 +51,6 @@ double. %package -n libqwt%{sover} Summary: Shared library for Qt5 Widgets for Technical Applications Group: System/Libraries -Obsoletes: lib%{name}-qt5-%{oldver} < %{version} Provides: lib%{name}-qt5-%{sover} = %{version} Obsoletes: lib%{name}-qt5-%{sover} < %{version} @@ -87,6 +85,7 @@ in order to create Qt applications using the Qwt(Qt5) widgets. %package examples Summary: Example programs using Qwt(Qt5) +License: SUSE-QWT-1.0 or BSD-3-Clause Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} Provides: %{name}-qt5-examples = %{version} @@ -155,7 +154,7 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \ %else %doc COPYING %endif -%{_libqt5_libdir}/libqwt.so.* +%{_libqt5_libdir}/libqwt.so.?.?.? %files designer %dir %{_libqt5_plugindir}/designer/ @@ -164,6 +163,8 @@ mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \ %files devel %doc README %{_libqt5_libdir}/libqwt.so +%{_libqt5_libdir}/libqwt.so.? +%{_libqt5_libdir}/libqwt.so.?.? %{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc %{_libqt5_archdatadir}/mkspecs/features/ %dir %{_libqt5_includedir}/qwt6