From 555eb3973bd383be3fd7637d512c25761081e7e9a0f7edcb1cb087ea4bdcf6d6 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 11 Feb 2014 09:34:53 +0000
Subject: [PATCH] Accepting request 221703 from KDE:Qt5
install license files to %doc (forwarded request 221617 from mlin7442)
OBS-URL: https://build.opensuse.org/request/show/221703
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtquickcontrols?expand=0&rev=6
---
libqt5-qtquickcontrols.changes | 12 +++++++
libqt5-qtquickcontrols.spec | 38 ++++++++++++++++-----
qtquickcontrols-opensource-src-5.2.0.tar.xz | 3 --
qtquickcontrols-opensource-src-5.2.1.tar.xz | 3 ++
4 files changed, 45 insertions(+), 11 deletions(-)
delete mode 100644 qtquickcontrols-opensource-src-5.2.0.tar.xz
create mode 100644 qtquickcontrols-opensource-src-5.2.1.tar.xz
diff --git a/libqt5-qtquickcontrols.changes b/libqt5-qtquickcontrols.changes
index f39aad8..86b76bf 100644
--- a/libqt5-qtquickcontrols.changes
+++ b/libqt5-qtquickcontrols.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Feb 10 11:24:34 UTC 2014 - mlin@suse.com
+
+- Install LICENSE files to %doc
+
+-------------------------------------------------------------------
+Wed Feb 5 17:07:24 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.2.1:
+ * For more details please see:
+ http://blog.qt.digia.com/blog/2014/02/05/qt-5-2-1-released/
+
-------------------------------------------------------------------
Thu Dec 12 13:42:39 UTC 2013 - hrvoje.senjan@gmail.com
- Update to 5.2.0 final:
diff --git a/libqt5-qtquickcontrols.spec b/libqt5-qtquickcontrols.spec
index 308e847..05d8dc6 100644
--- a/libqt5-qtquickcontrols.spec
+++ b/libqt5-qtquickcontrols.spec
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtquickcontrols
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,34 @@
#
+%define qt5_snapshot 0
+
Name: libqt5-qtquickcontrols
-Version: 5.2.0
+Version: 5.2.1
Release: 0
Summary: Qt 5 Serial Port Addon
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.2.1
+%define so_version 5.2.1
+%if %qt5_snapshot
+%define tar_version qtquickcontrols-%{real_version}
+%else
+%define tar_version qtquickcontrols-opensource-src-%{real_version}
+%endif
Source: %{tar_version}.tar.xz
BuildRequires: fdupes
-%define base_name libqt5
-%define real_version 5.2.0
-%define so_version 5.2.0
-%define tar_version qtquickcontrols-opensource-src-%{real_version}
-BuildRequires: libQt5Quick-private-headers-devel >= %{version}
+BuildRequires: libQt5Core-private-headers-devel >= %{version}
+BuildRequires: libQt5Gui-private-headers-devel >= %{version}
+BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version}
+BuildRequires: pkgconfig(Qt5Qml) >= %{version}
+BuildRequires: pkgconfig(Qt5Quick) >= %{version}
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires: perl
+%endif
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,10 +54,17 @@ This package contains base tools, like string, xml, and network
handling.
%prep
-%define plugindir %{_libdir}/qt5/plugins
+%if %qt5_snapshot
+%setup -q -n qtquickcontrols-%{real_version}
+%else
%setup -q -n qtquickcontrols-opensource-src-%{real_version}
+%endif
%build
+%if %qt5_snapshot
+#force the configure script to generate the forwarding headers (it checks whether .git directory exists)
+mkdir .git
+%endif
%qmake5
%make_jobs
@@ -52,6 +73,7 @@ handling.
%files
%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_archdatadir}/qml/QtQuick
%changelog
diff --git a/qtquickcontrols-opensource-src-5.2.0.tar.xz b/qtquickcontrols-opensource-src-5.2.0.tar.xz
deleted file mode 100644
index b103fbe..0000000
--- a/qtquickcontrols-opensource-src-5.2.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c
-size 597420
diff --git a/qtquickcontrols-opensource-src-5.2.1.tar.xz b/qtquickcontrols-opensource-src-5.2.1.tar.xz
new file mode 100644
index 0000000..3769aad
--- /dev/null
+++ b/qtquickcontrols-opensource-src-5.2.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac
+size 598328