Hello community,
here is the log from the commit of package libqt5-qtdeclarative for
openSUSE:Factory checked in at 2014-02-18 16:17:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtdeclarative (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtdeclarative"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtdeclarative/libqt5-qtdeclarative.changes
2013-12-19 12:41:12.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/libqt5-qtdeclarative.changes
2014-02-18 16:17:32.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Feb 10 10:35:16 UTC 2014 - m...@suse.com
+
+- Add License files to %doc
+
+-------------------------------------------------------------------
+Wed Feb 5 17:07:24 UTC 2014 - hrvoje.sen...@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
+- Added aarch64-support.patch from upstream (merged for 5.3)
+
+-------------------------------------------------------------------
Old:
----
qtdeclarative-opensource-src-5.2.0.tar.xz
New:
----
aarch64-support.patch
qtdeclarative-opensource-src-5.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtdeclarative.spec ++++++
--- /var/tmp/diff_new_pack.RKauT4/_old 2014-02-18 16:17:33.000000000 +0100
+++ /var/tmp/diff_new_pack.RKauT4/_new 2014-02-18 16:17:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtdeclarative
#
-# 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,24 +16,42 @@
#
+%define qt5_snapshot 0
+
%define libname libQtQuick5
Name: libqt5-qtdeclarative
-Version: 5.2.0
+Version: 5.2.1
Release: 0
Summary: Qt 5 Declarative 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-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 qtdeclarative-%{real_version}
+%else
%define tar_version qtdeclarative-opensource-src-%{real_version}
-BuildRequires: libqt5-qtxmlpatterns-devel >= %{version}
-BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
+%endif
+Source: %{tar_version}.tar.xz
+# PATCH-FIX-UPSTREAM aarch64-support.patch -- add support for aarch64
+Patch0: aarch64-support.patch
+BuildRequires: fdupes
+BuildRequires: libQt5Core-private-headers-devel >= %{version}
+BuildRequires: libQt5Gui-private-headers-devel >= %{version}
+BuildRequires: libQt5Test-private-headers-devel >= %{version}
+BuildRequires: pkgconfig(Qt5Core) >= %{version}
+BuildRequires: pkgconfig(Qt5Gui) >= %{version}
+BuildRequires: pkgconfig(Qt5Network) >= %{version}
+BuildRequires: pkgconfig(Qt5Sql) >= %{version}
+BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
+BuildRequires: pkgconfig(Qt5XmlPatterns) >= %{version}
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires: perl
+%endif
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,7 +63,12 @@
handling.
%prep
+%if %qt5_snapshot
+%setup -q -n qtdeclarative-%{real_version}
+%else
%setup -q -n qtdeclarative-opensource-src-%{real_version}
+%endif
+%patch0 -p1
%package -n %libname
Summary: Qt 5 Declarative Library
@@ -61,12 +84,8 @@
Summary: Qt Development Kit
Group: Development/Libraries/X11
Requires: %libname = %{version}
-Requires: libqt5-qtsvg-devel >= %{version}
-Requires: libqt5-qtxmlpatterns-devel >= %{version}
-Requires: libqt5-qtbase-devel >= %{version}
Provides: libQt5Quick-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes: libQt5Quick-devel <= %{version}
+Obsoletes: libQt5Quick-devel < %{version}
%description devel
You need this package, if you want to compile programs with qtdeclarative.
@@ -75,10 +94,11 @@
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
-Requires: libqt5-qtbase-private-headers-devel >= %{version}
+Requires: libQt5Core-private-headers-devel >= %{version}
+Requires: libQt5Gui-private-headers-devel >= %{version}
+Requires: libQt5Test-private-headers-devel >= %{version}
Provides: libQt5Quick-private-headers-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes: libQt5Quick-private-headers-devel <= %{version}
+Obsoletes: libQt5Quick-private-headers-devel < %{version}
%description private-headers-devel
This package provides private headers of libqt5-qtdeclarative that are normally
@@ -91,6 +111,10 @@
%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
@@ -98,24 +122,32 @@
%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' {} \;
+# kill .la files
+rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
-# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back
to %_qt5_bindir
-mkdir %{buildroot}%{_bindir}
+# put all the binaries to %%_bindir, add -qt5 suffix, and symlink them back to
%%_qt5_bindir
+mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_libqt5_bindir}
for i in * ; do
+ case "${i}" in
+ qmlplugindump|qmlprofiler)
mv $i ../../../bin/${i}-qt5
ln -s ../../../bin/${i}-qt5 .
ln -s ../../../bin/${i}-qt5 $i
+ ;;
+ *)
+ mv $i ../../../bin/
+ ln -s ../../../bin/$i .
+ ;;
+ esac
done
popd
-%fdupes %{buildroot}/%{_lib}qt5_includedir
-
-%clean
-rm -rf %{buildroot}
+%fdupes -s %{buildroot}/%{_libqt5_includedir}
%files -n %libname
%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_libdir}/libQt5Q*.so.*
%{_libqt5_archdatadir}/qml/QtQuick
%{_libqt5_archdatadir}/qml/QtQuick.2
@@ -131,16 +163,17 @@
%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
%{_bindir}/*
%{_libqt5_bindir}/*
%exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5*
-%{_libqt5_libdir}/libQt5*.la
%{_libqt5_libdir}/libQt5*.prl
%{_libqt5_libdir}/libQt5Q*.so
%{_libqt5_libdir}/libQt5Q*.a
++++++ aarch64-support.patch ++++++
++++ 843 lines (skipped)
++++++ qtdeclarative-opensource-src-5.2.0.tar.xz ->
qtdeclarative-opensource-src-5.2.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtdeclarative/qtdeclarative-opensource-src-5.2.0.tar.xz
/work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/qtdeclarative-opensource-src-5.2.1.tar.xz
differ: char 26, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
