Hello community, here is the log from the commit of package libqt5-qtquick1 for openSUSE:Factory checked in at 2016-06-25 01:55:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-25 13:05:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtquick1.new/libqt5-qtquick1.changes 2016-06-25 01:55:55.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 11 18:42:44 UTC 2016 - [email protected] + +- Fix build with Qt 5.6.1 - added + pretend-that-the-example-installs-are-not-FUBAR.patch and + do-not-enable-example-installs-explicitly-any-more.patch + +------------------------------------------------------------------- New: ---- do-not-enable-example-installs-explicitly-any-more.patch pretend-that-the-example-installs-are-not-FUBAR.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtquick1.spec ++++++ --- /var/tmp/diff_new_pack.tNj8kC/_old 2016-06-25 01:55:56.000000000 +0200 +++ /var/tmp/diff_new_pack.tNj8kC/_new 2016-06-25 01:55:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtquick1 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ %define tar_version qtquick1-opensource-src-%{real_version} Source: %{tar_version}.tar.xz Source1: baselibs.conf +Patch0: pretend-that-the-example-installs-are-not-FUBAR.patch +Patch1: do-not-enable-example-installs-explicitly-any-more.patch %if %qt5_snapshot #to create the forwarding headers BuildRequires: perl @@ -61,6 +63,8 @@ %prep %setup -q -n qtquick1-opensource-src-%{real_version} +%patch0 -p1 +%patch1 -p1 %package -n %libname Summary: Qt 5 Quick1 Library ++++++ do-not-enable-example-installs-explicitly-any-more.patch ++++++ >From dbc9131ebb300e715d5ebd815dc3ef9aa77ebf56 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <[email protected]> Date: Wed, 20 Apr 2016 21:23:04 +0200 Subject: do not enable example installs explicitly any more it's done centrally now. Change-Id: I5354ed1d92ffb988a0771783f94ee728b9ebeb12 Reviewed-by: Oswald Buddenhagen <[email protected]> --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2b42c0b..4b4820c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs # Pretend that the example installs are not FUBAR. CONFIG += install_ok -- cgit v0.11.0 ++++++ pretend-that-the-example-installs-are-not-FUBAR.patch ++++++ >From 5f81e69d4b6f9b450f9b275e8eacbf606366c196 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <[email protected]> Date: Wed, 20 Apr 2016 21:10:34 +0200 Subject: pretend that the example installs are not FUBAR Change-Id: I1fad2e055f3d10d481a4bb01c014e9ac8c1abf44 Reviewed-by: Oswald Buddenhagen <[email protected]> --- .qmake.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.qmake.conf b/.qmake.conf index 9450b83..2b42c0b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs +# Pretend that the example installs are not FUBAR. +CONFIG += install_ok MODULE_VERSION = 5.5.1 -- cgit v0.11.0
