From b177eb3768009a99084f595a8cae0b9b924486458c2bf7b5e259be2b33aa91e3 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 2 Apr 2019 07:18:31 +0000
Subject: [PATCH] Accepting request 689941 from KDE:Qt5

- Add private-headers-devel subpackage - those were not packaged at all before
- Clean .spec a bit
- Use %license

OBS-URL: https://build.opensuse.org/request/show/689941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtquickcontrols2?expand=0&rev=13
---
 libqt5-qtquickcontrols2.changes |  7 ++++++
 libqt5-qtquickcontrols2.spec    | 40 +++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/libqt5-qtquickcontrols2.changes b/libqt5-qtquickcontrols2.changes
index 488eee9..f629b30 100644
--- a/libqt5-qtquickcontrols2.changes
+++ b/libqt5-qtquickcontrols2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 29 18:49:11 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Add private-headers-devel subpackage - those were not packaged at all before
+- Clean .spec a bit
+- Use %license
+
 -------------------------------------------------------------------
 Thu Mar 14 08:51:39 UTC 2019 - fabian@ritter-vogt.de
 
diff --git a/libqt5-qtquickcontrols2.spec b/libqt5-qtquickcontrols2.spec
index 98de7ee..6f32754 100644
--- a/libqt5-qtquickcontrols2.spec
+++ b/libqt5-qtquickcontrols2.spec
@@ -44,7 +44,6 @@ BuildRequires:  perl
 BuildRequires:  xz
 %requires_ge libQt5Widgets5
 %requires_ge libQtQuick5
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The Qt Quick Controls2 module provides a set of controls that
@@ -83,6 +82,16 @@ Requires:       libQt5QuickTemplates2-5 = %version
 %description -n libQt5QuickTemplates2-devel
 You need this package if you want to compile programs with qtquickcontrols2.
 
+%package private-headers-devel
+Summary:        Headers for the unstable API of the Qt5 QuickControls2 module
+Group:          Development/Libraries/X11
+Requires:       libQt5QuickControls2-devel = %version
+Requires:       libQt5QuickTemplates2-devel = %version
+
+%description private-headers-devel
+You need this package if you want to compile programs against the unstable API
+of the Qt5 QuickControls 2 module.
+
 %package examples
 Summary:        Qt5 quickcontrols2 examples
 Group:          Development/Libraries/X11
@@ -91,7 +100,7 @@ Group:          Development/Libraries/X11
 Examples for libqt5-qtquickcontrols2 module.
 
 %prep
-%setup -q -n %{tar_version}
+%autosetup -n %{tar_version}
 
 %build
 %if %qt5_snapshot
@@ -111,32 +120,26 @@ find %{buildroot}/%{_libqt5_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAK
 rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
 %post -n libQt5QuickControls2-5 -p /sbin/ldconfig
-
 %postun -n libQt5QuickControls2-5 -p /sbin/ldconfig
 
 %post -n libQt5QuickTemplates2-5 -p /sbin/ldconfig
-
 %postun -n libQt5QuickTemplates2-5 -p /sbin/ldconfig
 
 %files -n libQt5QuickControls2-5
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %{_libqt5_libdir}/libQt5QuickControls2.so.*
 
 %files -n libQt5QuickTemplates2-5
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %{_libqt5_libdir}/libQt5QuickTemplates2.so.*
 
 %files
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %{_libqt5_archdatadir}/qml/QtQuick
 %{_libqt5_archdatadir}/qml/Qt
 
 %files -n libQt5QuickControls2-devel
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %exclude %{_libqt5_includedir}/QtQuickControls2/%{so_version}
 %{_libqt5_includedir}/QtQuickControls2
 %{_libqt5_libdir}/cmake/Qt5QuickControls2
@@ -144,20 +147,23 @@ rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 %{_libqt5_libdir}/libQt5QuickControls2.so
 %{_libqt5_libdir}/pkgconfig/Qt5QuickControls2.pc
 %{_libqt5_archdatadir}/mkspecs/modules/qt_lib_quickcontrols2.pri
-%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_quickcontrols2_private.pri
 
 %files -n libQt5QuickTemplates2-devel
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %exclude %{_libqt5_includedir}/QtQuickTemplates2/%{so_version}
 %{_libqt5_includedir}/QtQuickTemplates2
 %{_libqt5_libdir}/libQt5QuickTemplates2.prl
 %{_libqt5_libdir}/libQt5QuickTemplates2.so
+
+%files private-headers-devel
+%license LICENSE.*
+%{_libqt5_includedir}/QtQuickControls2/%{so_version}
+%{_libqt5_includedir}/QtQuickTemplates2/%{so_version}
+%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_quickcontrols2_private.pri
 %{_libqt5_archdatadir}/mkspecs/modules/qt_lib_quicktemplates2_private.pri
 
 %files examples
-%defattr(-,root,root,755)
-%doc LICENSE.*
+%license LICENSE.*
 %{_libqt5_examplesdir}/
 
 %changelog