Accepting request 221707 from KDE:Qt5

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

OBS-URL: https://build.opensuse.org/request/show/221707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtsvg?expand=0&rev=7

libqt5-qtsvg.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Feb 10 11:19:39 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/
+
 -------------------------------------------------------------------
 Mon Dec 16 23:19:32 UTC 2013 - hrvoje.senjan@gmail.com
 

libqt5-qtsvg.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtsvg
 #
-# 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,22 +16,38 @@
 #
 
 
+%define qt5_snapshot 0
+
 %define libname libQt5Svg5
 
 Name:           libqt5-qtsvg
-Version:        5.2.0
+Version:        5.2.1
 Release:        0
 Summary:        Qt 5 SVG Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
-Source:         %{tar_version}.tar.xz
 %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 qtsvg-%{real_version}
+%else
 %define tar_version qtsvg-opensource-src-%{real_version}
-BuildRequires:  libqt5-qtbase-devel >= %{version}
-BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
+%endif
+Source:         %{tar_version}.tar.xz
+BuildRequires:  libQt5Core-private-headers-devel >= %{version}
+BuildRequires:  libQt5Gui-private-headers-devel >= %{version}
+BuildRequires:  libQt5Widgets-private-headers-devel >= %{version}
+BuildRequires:  pkgconfig(Qt5Core) >= %{version}
+BuildRequires:  pkgconfig(Qt5Gui) >= %{version}
+BuildRequires:  pkgconfig(Qt5Widgets) >= %{version}
+BuildRequires:  pkgconfig(Qt5Xml) >= %{version}
+BuildRequires:  pkgconfig(zlib)
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires:  perl
+%endif
 BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -42,7 +58,11 @@ This package contains base tools, like string, xml, and network
 handling.
 
 %prep
+%if %qt5_snapshot
+%setup -q -n qtsvg-%{real_version}
+%else
 %setup -q -n qtsvg-opensource-src-%{real_version}
+%endif
 
 %package -n %libname
 Summary:        Qt 5 SVG Library
@@ -58,10 +78,8 @@ handling.
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
 Requires:       %libname = %{version}
-Requires:       libqt5-qtbase-devel >= %{version}
 Provides:       libQt5Svg-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes:      libQt5Svg-devel <= %{version}
+Obsoletes:      libQt5Svg-devel < %{version}
 
 %description devel
 You need this package, if you want to compile programs with QtSvg.
@@ -70,10 +88,8 @@ You need this package, if you want to compile programs with QtSvg.
 Summary:        Non-ABI stable experimental API
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
-Requires:       libqt5-qtbase-private-headers-devel >= %{version}
 Provides:       libQt5Svg-private-headers-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes:      libQt5Svg-private-headers-devel <= %{version}
+Obsoletes:      libQt5Svg-private-headers-devel < %{version}
 
 %description private-headers-devel
 This package provides private headers of libqt5-qtsvg that are normally
@@ -86,29 +102,38 @@ the exact Qt version.
 %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}/libQt5Svg.so.*
+%dir %{_libqt5_plugindir}
 %{_libqt5_plugindir}/imageformats/libqsvg.so
 %{_libqt5_plugindir}/iconengines
 
 %files private-headers-devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_includedir}/Qt*/%{so_version}
 
 %files devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_includedir}/QtSvg
 %exclude %{_libqt5_includedir}/Qt*/%{so_version}
 %{_libqt5_includedir}/QtSvg
 %{_libqt5_libdir}/cmake/Qt5*
-%{_libqt5_libdir}/libQt5Svg.la
 %{_libqt5_libdir}/libQt5Svg.prl
 %{_libqt5_libdir}/libQt5Svg.so
 %{_libqt5_libdir}/pkgconfig/Qt5Svg.pc

qtsvg-opensource-src-5.2.0.tar.xz

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

qtsvg-opensource-src-5.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef
+size 1762520