Accepting request 221709 from KDE:Qt5

install license files to %doc (forwarded request 221623 from mlin7442)

OBS-URL: https://build.opensuse.org/request/show/221709
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtx11extras?expand=0&rev=6

libqt5-qtx11extras.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb 10 11:13:16 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/
+- Remove libtool archives from packages
+
 -------------------------------------------------------------------
 Mon Dec 16 23:19:32 UTC 2013 - hrvoje.senjan@gmail.com
 

libqt5-qtx11extras.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtx11extras
 #
-# 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,23 +16,34 @@
 #
 
 
+%define qt5_snapshot 0
+
 %define libname libQt5X11Extras5
 
 Name:           libqt5-qtx11extras
-BuildRequires:  fdupes
-Version:        5.2.0
+Version:        5.2.1
 Release:        0
 %define base_name libqt5
-%define real_version 5.2.0
-%define so_version 5.2.0
+%define real_version 5.2.1
+%define so_version 5.2.1
+%if %qt5_snapshot
+%define tar_version qtx11extras-%{real_version}
+%else
 %define tar_version qtx11extras-opensource-src-%{real_version}
-BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
+%endif
+Source:         %{tar_version}.tar.xz
+BuildRequires:  fdupes
+BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  pkgconfig(Qt5Widgets) >= %{version}
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires:  perl
+%endif
 BuildRequires:  xz
 Url:            http://qt.digia.com
 Summary:        Qt 5 X11 Extras Addon
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
-Source:         %{tar_version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,10 +52,12 @@ Qt is a set of libraries for developing applications.
 This package contains base tools, like string, xml, and network
 handling.
 
-
-
 %prep
+%if %qt5_snapshot
+%setup -q -n qtx11extras-%{real_version}
+%else
 %setup -q -n qtx11extras-opensource-src-%{real_version}
+%endif
 
 %package -n %libname
 Summary:        Qt 5 X11 Extras Addon
@@ -60,10 +73,8 @@ handling.
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
 Requires:       %libname = %version
-Requires:       libqt5-qtbase-private-headers-devel >= %{version}
 Provides:       libQt5X11Extras-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes:      libQt5X11Extras-devel <= %{version}
+Obsoletes:      libQt5X11Extras-devel < %{version}
 
 %description devel
 You need this package, if you want to compile programs with qtx11extras.
@@ -73,21 +84,28 @@ You need this package, if you want to compile programs with qtx11extras.
 %postun -n %libname -p /sbin/ldconfig
 
 %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
 
 %install
 %qmake5_install
+# kill .la files
+rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
 %files -n %libname
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5X11Extras.so.*
 
 %files devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_includedir}/QtX11Extras
 %{_libqt5_libdir}/cmake/Qt5X11Extras
-%{_libqt5_libdir}/libQt5X11Extras.la
 %{_libqt5_libdir}/libQt5X11Extras.prl
 %{_libqt5_libdir}/libQt5X11Extras.so
 %{_libqt5_libdir}/pkgconfig/Qt5X11Extras.pc

qtx11extras-opensource-src-5.2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4
-size 30160

qtx11extras-opensource-src-5.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9
+size 30152