[qt5-qtbase/f20: 9/10] Revert "backport the qatomic/ppc patch"
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 18 13:32:23 UTC 2013
commit 780dd8bbb94145c12690edd213de401761e2b2d6
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Oct 18 08:31:44 2013 -0500
Revert "backport the qatomic/ppc patch"
This reverts commit c18de56126eab663ebc80d314bf377285dbbf103.
qt5-qtbase.spec | 10 +---------
qtbase-qatomic-ppc.patch | 22 ----------------------
2 files changed, 1 insertions(+), 31 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 22a16d5..6efe017 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -15,7 +15,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.1.1
-Release: 6%{?dist}
+Release: 5%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -31,9 +31,6 @@ Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
# support multilib optflags
Patch2: qtbase-multilib_optflags.patch
-# qatomic on ppc/ppc64, http://bugzilla.redhat.com/1005482
-Patch3: qtbase-qatomic-ppc.patch
-
# upstreamable patches
# support poll
# https://bugreports.qt-project.org/browse/QTBUG-27195
@@ -169,8 +166,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
-%patch3 -p1 -b .qatomic-ppc
-
#patch50 -p1 -b .poll
%patch51 -p1 -b .bigendian
@@ -544,9 +539,6 @@ popd
%changelog
-* Thu Oct 17 2013 Lukáš Tinkl <ltinkl at redhat.com> - 5.1.1-6
-- Fixes #1005482 - qtbase FTBFS on ppc/ppc64
-
* Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5
- fix big endian builds
More information about the scm-commits
mailing list