From 3be78d4e61b52611d2087fbc119290ce77d94f908bbb0e6a3ebdd33acaad1b53 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 1 Mar 2015 14:26:36 +0000 Subject: [PATCH] Accepting request 287890 from KDE:Qt5 Update to 5.4.1 OBS-URL: https://build.opensuse.org/request/show/287890 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=22 --- libqt5-qttools-rpmlintrc | 1 + libqt5-qttools.changes | 9 +++++++++ libqt5-qttools.spec | 25 ++++++++++++++++++++----- qttools-opensource-src-5.4.0.tar.xz | 3 --- qttools-opensource-src-5.4.1.tar.xz | 3 +++ 5 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 libqt5-qttools-rpmlintrc delete mode 100644 qttools-opensource-src-5.4.0.tar.xz create mode 100644 qttools-opensource-src-5.4.1.tar.xz diff --git a/libqt5-qttools-rpmlintrc b/libqt5-qttools-rpmlintrc new file mode 100644 index 0000000..30acbd1 --- /dev/null +++ b/libqt5-qttools-rpmlintrc @@ -0,0 +1 @@ +addFilter("shlib-fixed-dependency .*") \ No newline at end of file diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 045f102..c338ad6 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Feb 24 16:10:28 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.1 + * For more details please see: + http://blog.qt.io/blog/2015/02/24/qt-5-4-1-released/ +- Add minimal requires on other Qt5 libraries, as well the one from + this source package +- Added libqt5-qttools-rpmlintrc due to shlib-fixed-dependency +------------------------------------------------------------------- Fri Feb 20 19:07:14 UTC 2015 - buschmann23@opensuse.org - added libQt5Sql5-sqlite to the Requires for libqt5-qttools, because diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 9a0c227..827948b 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -19,15 +19,15 @@ %define qt5_snapshot 0 Name: libqt5-qttools -Version: 5.4.0 +Version: 5.4.1 Release: 0 Summary: Qt 5 QtTools Module License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.4.0 -%define so_version 5.4.0 +%define real_version 5.4.1 +%define so_version 5.4.1 %define tar_version qttools-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf @@ -35,6 +35,7 @@ Source11: designer5.desktop Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop +Source99: libqt5-qttools-rpmlintrc # PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com Patch0: fix-for-opensuse-qmake-qt5.patch # PATCH-FIX-UPSTREAM qdbusviewer-restore-the-window-size-and-state-on-startup.patch -- qdbusviewer: Restore the window size and state on startup @@ -48,14 +49,17 @@ BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: libxslt-devel BuildRequires: update-desktop-files -Requires: libQt5Sql5-sqlite Recommends: libqt5-linguist %if %qt5_snapshot #to create the forwarding headers BuildRequires: perl %endif BuildRequires: xz - +Requires: libQt5Designer5 = %{version} +Requires: libQt5DesignerComponents5 = %{version} +Requires: libQt5Help5 = %{version} +Requires: libQt5Sql5-sqlite >= %{version} +%requires_ge libQt5DBus5 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -106,6 +110,7 @@ Examples for libqt5-qttools module. %package -n libQt5CLucene5 Summary: Qt 5 Clucene Library Group: Development/Libraries/X11 +%requires_ge libQt5Core5 %description -n libQt5CLucene5 The Qt 5 Clucene library. @@ -113,6 +118,8 @@ The Qt 5 Clucene library. %package -n libQt5Designer5 Summary: Qt 5 Designer Library Group: Development/Libraries/X11 +%requires_ge libQt5Widgets5 +%requires_ge libQt5Xml5 %description -n libQt5Designer5 The Qt 5 Designer library. @@ -120,6 +127,7 @@ The Qt 5 Designer library. %package -n libQt5DesignerComponents5 Summary: Qt 5 Designer Components Library Group: Development/Libraries/X11 +Requires: libQt5Designer5 = %{version} %description -n libQt5DesignerComponents5 The Qt 5 Designer Components library. @@ -127,6 +135,10 @@ The Qt 5 Designer Components library. %package -n libQt5Help5 Summary: Qt 5 Help Library Group: Development/Libraries/X11 +Requires: libQt5CLucene5 = %{version} +%requires_ge libQt5Widgets5 +%requires_ge libQt5Sql5 +%requires_ge libQt5Network5 %description -n libQt5Help5 The Qt 5 Help library. @@ -134,6 +146,9 @@ The Qt 5 Help library. %package -n libqt5-linguist Summary: Qt 5 Linguist Tools Group: Development/Libraries/X11 +%requires_ge libQt5Widgets5 +%requires_ge libQt5Xml5 +%requires_ge libQt5PrintSupport5 %description -n libqt5-linguist The Qt 5 Linguist Tools. diff --git a/qttools-opensource-src-5.4.0.tar.xz b/qttools-opensource-src-5.4.0.tar.xz deleted file mode 100644 index bb6e305..0000000 --- a/qttools-opensource-src-5.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a85a096ffd30463781dc3871ad9640a510eba0086188c7943d23adc3660741a -size 9261924 diff --git a/qttools-opensource-src-5.4.1.tar.xz b/qttools-opensource-src-5.4.1.tar.xz new file mode 100644 index 0000000..273f23b --- /dev/null +++ b/qttools-opensource-src-5.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 +size 9262024