Hello community, here is the log from the commit of package libqt5-qtquick1 for openSUSE:Factory checked in at 2014-02-18 16:17:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick1 (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick1" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtquick1/libqt5-qtquick1.changes 2013-12-19 12:41:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/libqt5-qtquick1.changes 2014-02-18 16:17:57.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Feb 10 11:25:53 UTC 2014 - [email protected] + +- Install LICENSE files to %doc + +------------------------------------------------------------------- +Wed Feb 5 17:07:24 UTC 2014 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- qtquick1-opensource-src-5.2.0.tar.xz New: ---- qtquick1-opensource-src-5.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtquick1.spec ++++++ --- /var/tmp/diff_new_pack.g79W6j/_old 2014-02-18 16:17:58.000000000 +0100 +++ /var/tmp/diff_new_pack.g79W6j/_new 2014-02-18 16:17:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtquick1 # -# 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,25 +16,42 @@ # +%define qt5_snapshot 0 + %define libname libQt5Declarative5 Name: libqt5-qtquick1 -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: Qt 5 Quick1 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 + BuildRequires: fdupes -BuildRequires: libqt5-qtscript-private-headers-devel >= %{version} -BuildRequires: libqt5-qtsvg-devel >= %{version} %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 qtquick1-%{real_version} +%else %define tar_version qtquick1-opensource-src-%{real_version} -BuildRequires: libqt5-qtxmlpatterns-devel >= %{version} +%endif +Source: %{tar_version}.tar.xz +%if %qt5_snapshot +#to create the forwarding headers +BuildRequires: perl +%endif +BuildRequires: libQt5Core-private-headers-devel >= %{version} +BuildRequires: libQt5Gui-private-headers-devel >= %{version} +BuildRequires: libQt5Widgets-private-headers-devel >= %{version} +BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} +BuildRequires: libqt5-qtscript-private-headers-devel >= %{version} +BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= %{version} BuildRequires: xz +BuildRequires: pkgconfig(Qt5Network) >= %{version} +BuildRequires: pkgconfig(Qt5OpenGL) >= %{version} +BuildRequires: pkgconfig(Qt5Sql) >= %{version} Recommends: libqt5-qtgraphicaleffects = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +63,11 @@ handling. %prep +%if %qt5_snapshot +%setup -q -n qtquick1-%{real_version} +%else %setup -q -n qtquick1-opensource-src-%{real_version} +%endif %package -n %libname Summary: Qt 5 Quick1 Library @@ -62,12 +83,8 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} -Requires: libqt5-qtscript-devel >= %{version} -Requires: libqt5-qtsvg-devel >= %{version} -Requires: libqt5-qtxmlpatterns-devel >= %{version} Provides: libQt5Declarative-devel = %{version} -# TODO: change to < on 5.2.1 update -Obsoletes: libQt5Declarative-devel <= %{version} +Obsoletes: libQt5Declarative-devel < %{version} %description devel You need this package, if you want to compile programs with QtDeclarative. @@ -76,10 +93,14 @@ Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} +Requires: libQt5Core-private-headers-devel >= %{version} +Requires: libQt5Gui-private-headers-devel >= %{version} +Requires: libQt5Widgets-private-headers-devel >= %{version} +Requires: libqt5-qtbase-private-headers-devel >= %{version} Requires: libqt5-qtscript-private-headers-devel >= %{version} +Requires: libqt5-qtxmlpatterns-private-headers-devel >= %{version} Provides: libQt5Declarative-private-headers-devel = %{version} -# TODO: change to < on 5.2.1 update -Obsoletes: libQt5Declarative-private-headers-devel <= %{version} +Obsoletes: libQt5Declarative-private-headers-devel < %{version} %description private-headers-devel This package provides private headers of libqt5-QtDeclarative that are normally @@ -92,15 +113,21 @@ %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 find %{buildroot}/%{_libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; -%fdupes %{buildroot}/%{_libqt5_includedir} +# kill .la files +rm -f %{buildroot}%{_libqt5_libdir}/lib*.la +%fdupes -s %{buildroot}/%{_libqt5_includedir} -# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir +# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do @@ -110,11 +137,9 @@ done popd -%clean -rm -rf %{buildroot} - %files -n %libname %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %{_bindir}/* %{_libqt5_bindir}/* %{_libdir}/libQt5Declarative.so.* @@ -125,14 +150,15 @@ %files private-headers-devel %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %{_libqt5_includedir}/QtDeclarative/%{so_version} %files devel %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %exclude %{_libqt5_includedir}/QtDeclarative/%{so_version} %{_libqt5_includedir}/QtDeclarative %{_libqt5_libdir}/cmake/Qt5Declarative -%{_libqt5_libdir}/libQt5Declarative.la %{_libqt5_libdir}/libQt5Declarative.prl %{_libqt5_libdir}/libQt5Declarative.so %{_libqt5_libdir}/pkgconfig/Qt5Declarative.pc ++++++ qtquick1-opensource-src-5.2.0.tar.xz -> qtquick1-opensource-src-5.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtquick1/qtquick1-opensource-src-5.2.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/qtquick1-opensource-src-5.2.1.tar.xz differ: char 27, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
