From 95e44d5747efc08e394b6e1846a468eefdafbf0849596948cd4ea57a5db8cdca Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 4 Nov 2013 08:12:30 +0000 Subject: [PATCH] Accepting request 204737 from KDE:Qt5 Update to 5.2.0 beta1 OBS-URL: https://build.opensuse.org/request/show/204737 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=3 --- libqt5-qtdeclarative.changes | 8 +++++ libqt5-qtdeclarative.spec | 32 +++++++------------ qtdeclarative-opensource-src-5.1.1.tar.xz | 3 -- ...larative-opensource-src-5.2.0-beta1.tar.xz | 3 ++ 4 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 qtdeclarative-opensource-src-5.1.1.tar.xz create mode 100644 qtdeclarative-opensource-src-5.2.0-beta1.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index cdbc72b..3afe85d 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 23 17:11:55 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 5.2 beta1 + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-5-2-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.2 + ------------------------------------------------------------------- Thu Aug 29 17:00:21 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 0b6bc1e..9bf0918 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtdeclarative # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,19 +19,18 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.1.1 +Version: 5.2.0~beta1 Release: 0 -License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Summary: Qt 5 Declarative Library -Url: http://qt.digia.com +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: libQt5Svg-devel >= %{version} -BuildRequires: libQt5V8-private-headers-devel >= %{version} %define base_name libqt5 -%define real_version 5.1.1 -%define so_version 5.1.1 +%define real_version 5.2.0-beta1 +%define so_version 5.2.0 %define tar_version qtdeclarative-opensource-src-%{real_version} BuildRequires: libQt5XmlPatterns-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} @@ -63,7 +62,6 @@ Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} Requires: libQt5Svg-devel >= %{version} -Requires: libQt5V8-devel >= %{version} Requires: libQt5XmlPatterns-devel >= %{version} Requires: libqt5-qtbase-devel >= %{version} @@ -74,7 +72,6 @@ You need this package, if you want to compile programs with qtdeclarative. Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ Requires: libQt5Quick-devel = %{version} -Requires: libQt5V8-private-headers-devel >= %{version} Requires: libqt5-qtbase-private-headers-devel >= %{version} %description -n libQt5Quick-private-headers-devel @@ -92,18 +89,11 @@ the exact Qt version. %postun -n libQt5Quick-devel -p /sbin/ldconfig %build -export PATH=%{_libqt5_bindir}:$PATH -%ifarch ppc64 - RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif -export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" -export MAKEFLAGS="%{?_smp_mflags}" -qmake -make +%qmake5 +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install +%qmake5_install find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; @@ -133,6 +123,7 @@ rm -rf %{buildroot} %dir %{_libqt5_archdatadir}/qml/Qt/labs %dir %{_libqt5_archdatadir}/qml/QtQml %{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel +%{_libqt5_archdatadir}/qml/Qt/labs/settings/ %{_libqt5_plugindir}/accessible %{_libqt5_plugindir}/qmltooling @@ -146,7 +137,7 @@ rm -rf %{buildroot} %{_libqt5_bindir}/* %exclude %{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/Qt* -%{_libqt5_libdir}/cmake/Qt5Q* +%{_libqt5_libdir}/cmake/Qt5* %{_libqt5_libdir}/libQt5*.la %{_libqt5_libdir}/libQt5*.prl %{_libqt5_libdir}/libQt5Q*.so @@ -156,5 +147,4 @@ rm -rf %{buildroot} %{_libqt5_archdatadir}/qml/QtTest %{_libqt5_libdir}/pkgconfig/Qt5QuickParticles.pc - %changelog diff --git a/qtdeclarative-opensource-src-5.1.1.tar.xz b/qtdeclarative-opensource-src-5.1.1.tar.xz deleted file mode 100644 index 60f01d5..0000000 --- a/qtdeclarative-opensource-src-5.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31 -size 16722888 diff --git a/qtdeclarative-opensource-src-5.2.0-beta1.tar.xz b/qtdeclarative-opensource-src-5.2.0-beta1.tar.xz new file mode 100644 index 0000000..88fe6b7 --- /dev/null +++ b/qtdeclarative-opensource-src-5.2.0-beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad8fa83a37f89a92eda6dd689d2af5b4f3063584887ffeac1c73821978397fd1 +size 17500920