From 6fe871c76c202c32b69280e94b2e2c339a5c28baf4d9fed480012d6cb8cf4a5e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 4 Jun 2014 16:38:26 +0000 Subject: [PATCH] Accepting request 236091 from KDE:Qt5 - Improve baselibs - Improve situation with rpmlints duplicates warnings - Make private headers noarch OBS-URL: https://build.opensuse.org/request/show/236091 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=21 --- baselibs.conf | 55 +++++++++++++++++++++++++++++++++++++++---- libqt5-qtbase.changes | 7 ++++++ libqt5-qtbase.spec | 17 +++++++++++++ 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index f219dfd..8f0c166 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,19 +23,64 @@ libQt5Sql5-postgresql libQt5Sql5-mysql obsoletes "libqt5-sql-mysql- < " provides "libqt5-sql-mysql- = " -libqt5-qtbase-devel +libQt5Core-devel requires "libQt5Core5- = " +libQt5Concurrent-devel requires "libQt5Concurrent5- = " + requires "libQt5Core-devel- = " +libQt5DBus-devel + requires "libQt5Core-devel- = " requires "libQt5DBus5- = " +libQt5Network-devel + requires "libQt5Core-devel- = " requires "libQt5Network5- = " +libQt5OpenGL-devel + requires "libQt5Core-devel- = " + requires "libQt5Gui-devel- = " requires "libQt5OpenGL5- = " + requires "libQt5Widgets-devel- = " +libQt5PrintSupport-devel + requires "libQt5Core-devel- = " + requires "libQt5Gui-devel- = " requires "libQt5PrintSupport5- = " + requires "libQt5Widgets-devel- = " +libQt5Xml-devel + requires "libQt5Core-devel- = " requires "libQt5Xml5- = " - requires "libQt5Gui5- = " - requires "libQt5Sql5- = " +libQt5Test-devel + requires "libQt5Core-devel- = " requires "libQt5Test5- = " +libQt5Widgets-devel + requires "libQt5Core-devel- = " + requires "libQt5Gui-devel- = " requires "libQt5Widgets5- = " +libQt5Gui-devel + requires "libQt5Core-devel- = " + requires "libQt5Gui5- = " +libQt5Sql-devel + requires "libQt5Core-devel- = " + requires "libQt5Sql5- = " + requires "libQt5Sql5-mysql- = " + requires "libQt5Sql5-postgresql- = " requires "libQt5Sql5-sqlite- = " requires "libQt5Sql5-unixODBC- = " - requires "libQt5Sql5-postgresql- = " - requires "libQt5Sql5-mysql- = " \ No newline at end of file +libQt5Bootstrap-devel-static +libQt5OpenGLExtensions-devel-static + requires "libQt5Core-devel- = " + requires "libQt5Gui-devel- = " +libQt5PlatformSupport-devel-static + requires "libQt5Core-devel- = " + requires "libQt5Gui-devel- = " +libqt5-qtbase-examples +libqt5-qtbase-devel + requires "libQt5Concurrent-devel- = " + requires "libQt5Core-devel- = " + requires "libQt5DBus-devel- = " + requires "libQt5Gui-devel- = " + requires "libQt5Network-devel- = " + requires "libQt5OpenGL-devel- = " + requires "libQt5PrintSupport-devel- = " + requires "libQt5Sql-devel- = " + requires "libQt5Test-devel- = " + requires "libQt5Widgets-devel- = " + requires "libQt5Xml-devel- = " diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 0d289bd..6892881 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jun 1 23:43:25 UTC 2014 - hrvoje.senjan@gmail.com + +- Improve baselibs +- Improve situation with rpmlints duplicates warnings +- Make private headers noarch + ------------------------------------------------------------------- Tue May 27 09:52:05 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index ec85e05..2159457 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -205,6 +205,7 @@ Qt 5 Core Library - development files. %package -n libQt5Core-private-headers-devel Summary: Qt 5 Core Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-devel = %{version} %description -n libQt5Core-private-headers-devel @@ -246,6 +247,7 @@ Qt5's qdbusxml2cpp and qdbuscpp2xml binaries. %package -n libQt5DBus-private-headers-devel Summary: Qt 5 DBus Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5DBus-devel = %{version} @@ -271,6 +273,7 @@ The Qt 5 Network library - development files. %package -n libQt5Network-private-headers-devel Summary: Qt 5 Network Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Network-devel = %{version} @@ -303,6 +306,7 @@ The Qt 5 OpenGL library - development files. %package -n libQt5OpenGL-private-headers-devel Summary: Qt 5 OpenGL Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} Requires: libQt5OpenGL-devel = %{version} @@ -332,6 +336,7 @@ The Qt 5 Print Support library - development files. %package -n libQt5PrintSupport-private-headers-devel Summary: Qt 5 Print Support Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} Requires: libQt5PrintSupport-devel = %{version} @@ -375,6 +380,7 @@ The Qt 5 library for testing - development files. %package -n libQt5Test-private-headers-devel Summary: Qt 5 Test Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Test-devel = %{version} @@ -401,6 +407,7 @@ The Qt 5 library to display widgets - development files. %package -n libQt5Widgets-private-headers-devel Summary: Qt 5 Widgets Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} Requires: libQt5Widgets-devel = %{version} @@ -481,6 +488,7 @@ Qt 5 libraries which are depending on X11 - development files. %package -n libQt5Gui-private-headers-devel Summary: Qt 5 Gui Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Gui-devel = %{version} @@ -514,6 +522,7 @@ will need also a plugin package for a supported SQL server - development files. %package -n libQt5Sql-private-headers-devel Summary: Qt 5 SQL Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Sql-devel = %{version} @@ -532,6 +541,7 @@ Qt 5 tool used by Qt Developers to generate documentation for software projects. %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5DBus-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} @@ -592,6 +602,7 @@ Qt PlatformSupport module. %package -n libQt5PlatformSupport-private-headers-devel Summary: Qt 5 PlatformSupport Library - Non-ABI stable development files Group: Development/Libraries/X11 +BuildArch: noarch Requires: libQt5Core-private-headers-devel = %{version} Requires: libQt5Gui-private-headers-devel = %{version} Requires: libQt5PlatformSupport-devel-static = %{version} @@ -751,6 +762,12 @@ popd # Only symlink mkspecs, as headers and cmake files are across different packages. If needed, call fdupes on every dir, as per package split %fdupes -s %{buildroot}%{libqt5_archdatadir}/mkspecs/ +%fdupes -s %{buildroot}%{libqt5_examplesdir}/ + +for headers in QtCore QtConcurrent QtTest QtNetwork QtXml QtSql QtGui QtWidgets QtDBus QtPrintSupport QtOpenGL; do + %fdupes -s %{buildroot}%{libqt5_includedir}/$headers +done + %post -n libQt5Core5 -p /sbin/ldconfig %post -n libQt5Concurrent5 -p /sbin/ldconfig