From b38562bc8b5651c688857e98f965b34679bb6a66 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 5 Aug 2015 02:31:40 +0200 Subject: [PATCH] remove GDB hackery, it is not producing useful backtraces for the ARM crash * Wed Aug 08 2015 Kevin Kofler - 5.5.0-12 - remove GDB hackery, it is not producing useful backtraces for the ARM crash --- qdoc.gdb | 8 -------- qt5-qtbase.spec | 16 +++++----------- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100755 qdoc.gdb diff --git a/qdoc.gdb b/qdoc.gdb deleted file mode 100755 index a4dc022..0000000 --- a/qdoc.gdb +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# run process through gdb instead - -DIRNAME=$(dirname $0) -set -x -gdb -q --eval-command="run" --eval-command="thread apply all bt" --eval-command="quit" --args ${DIRNAME}/qdoc.orig $@ - diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f308379..8b7de2e 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -39,15 +39,13 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.5.0 -Release: 11%{?dist} +Release: 12%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz -Source2: qdoc.gdb - # header file to workaround multilib issue # https://bugzilla.redhat.com/show_bug.cgi?id=1036956 Source5: qconfig-multilib.h @@ -136,8 +134,6 @@ Source1: macros.qt5 # RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support. %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ -# for doc hacks -BuildRequires: gdb # for %%check BuildRequires: cmake BuildRequires: cups-devel @@ -470,12 +466,7 @@ pushd src/xml; ../../bin/qmake; popd # HACK to avoid multilib conflicts in noarch content # see also https://bugreports.qt-project.org/browse/QTBUG-42071 QT_HASH_SEED=0; export QT_HASH_SEED -make html_docs MAKE='make -k' || \ -( mv bin/qdoc bin/qdoc.orig - install %{SOURCE2} bin/qdoc - make html_docs MAKE='make -k' ||: - mv bin/qdoc.orig bin/qdoc -f -) +make html_docs make qch_docs %endif @@ -928,6 +919,9 @@ fi %changelog +* Wed Aug 08 2015 Kevin Kofler - 5.5.0-12 +- remove GDB hackery, it is not producing useful backtraces for the ARM crash + * Mon Aug 03 2015 Helio Chissini de Castro - 5.5.0-11 - Add mesa-dri-drivers as recommends on gui package as reported by Kevin Kofler - Reference https://bugzilla.redhat.com/1249280