commit libqt5-qtsvg for openSUSE:Factory
Hello community, here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2014-02-11 10:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtsvg" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2013-12-19 12:44:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new/libqt5-qtsvg.changes 2014-02-11 10:35:01.000000000 +0100 @@ -1,0 +2,12 @@ +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/ + +------------------------------------------------------------------- Old: ---- qtsvg-opensource-src-5.2.0.tar.xz New: ---- qtsvg-opensource-src-5.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtsvg.spec ++++++ --- /var/tmp/diff_new_pack.5tbTw8/_old 2014-02-11 10:35:01.000000000 +0100 +++ /var/tmp/diff_new_pack.5tbTw8/_new 2014-02-11 10:35:01.000000000 +0100 @@ -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 @@ 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 @@ 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 @@ 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 @@ %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 -> qtsvg-opensource-src-5.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/.qmake.conf new/qtsvg-opensource-src-5.2.1/.qmake.conf --- old/qtsvg-opensource-src-5.2.0/.qmake.conf 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/.qmake.conf 2014-02-01 21:38:04.000000000 +0100 @@ -1,4 +1,5 @@ load(qt_build_config) CONFIG += qt_example_installs +CONFIG += warning_clean -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/.tag new/qtsvg-opensource-src-5.2.1/.tag --- old/qtsvg-opensource-src-5.2.0/.tag 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/.tag 2014-02-01 21:38:05.000000000 +0100 @@ -1 +1 @@ -b719b93770393bbf20251e1dffc70498061e612c +62c8144782b380407c87d0f75a0f7f7df3847035 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgfont_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgfont_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgfunctions_wince_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgfunctions_wince_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvggraphics_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvghandler_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvghandler_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgnode_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgnode_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgstructure_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgstyle_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.0/QtSvg/private/qsvgtinydocument_p.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h 2014-02-01 21:38:04.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/include/QtSvg/qtsvgversion.h new/qtsvg-opensource-src-5.2.1/include/QtSvg/qtsvgversion.h --- old/qtsvg-opensource-src-5.2.0/include/QtSvg/qtsvgversion.h 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/include/QtSvg/qtsvgversion.h 2014-02-01 21:38:04.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.2.0" +#define QTSVG_VERSION_STR "5.2.1" -#define QTSVG_VERSION 0x050200 +#define QTSVG_VERSION 0x050201 #endif // QT_QTSVG_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.2.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp new/qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp --- old/qtsvg-opensource-src-5.2.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2013-12-08 18:10:21.000000000 +0100 +++ new/qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2014-02-01 21:38:05.000000000 +0100 @@ -87,11 +87,6 @@ QAtomicInt QSvgIconEnginePrivate::lastSerialNum; -static inline int pmKey(const QSize &size, QIcon::Mode mode, QIcon::State state) -{ - return ((((((size.width()<<11)|size.height())<<11)|mode)<<4)|state); -} - QSvgIconEngine::QSvgIconEngine() : d(new QSvgIconEnginePrivate) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de