From 780dd8bbb94145c12690edd213de401761e2b2d6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 18 Oct 2013 08:31:44 -0500
Subject: [PATCH] Revert "backport the qatomic/ppc patch"

This reverts commit c18de56126eab663ebc80d314bf377285dbbf103.
---
 qt5-qtbase.spec          | 10 +---------
 qtbase-qatomic-ppc.patch | 22 ----------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 qtbase-qatomic-ppc.patch

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@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
 
diff --git a/qtbase-qatomic-ppc.patch b/qtbase-qatomic-ppc.patch
deleted file mode 100644
index 4e1ac59..0000000
--- a/qtbase-qatomic-ppc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
-===================================================================
---- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h
-+++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h
-@@ -63,7 +63,7 @@ public:
-     // Atomic API, implemented in qatomic_XXX.h
- 
-     int load() const { return _q_value; }
--    int loadAcquire() { return _q_value; }
-+    int loadAcquire() const { return _q_value; }
-     void store(int newValue) { _q_value = newValue; }
-     void storeRelease(int newValue) { _q_value = newValue; }
- 
-@@ -107,7 +107,7 @@ public:
-     // Atomic API, implemented in qatomic_XXX.h
- 
-     T *load() const { return _q_value; }
--    T *loadAcquire() { return _q_value; }
-+    T *loadAcquire() const { return _q_value; }
-     void store(T *newValue) { _q_value = newValue; }
-     void storeRelease(T *newValue) { _q_value = newValue; }
-