[qt5-qtbase] Revert "use platform linux-g++ everywhere"
Rex Dieter
rdieter at fedoraproject.org
Sat Apr 20 04:08:32 UTC 2013
commit 18302a120a7de62d49ed7d32f8cb9c23d53077a6
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Apr 19 23:07:42 2013 -0500
Revert "use platform linux-g++ everywhere"
This reverts commit 6c40209119649e4fa75b6a1c094acf9166711d88.
changed my mind, thought upstream was planning doing this (soon?) anyway,
but can't find the reference right now.
qt5-qtbase.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 4b4946d..170f540 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -8,7 +8,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.0.2
-Release: 5%{?dist}
+Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -159,6 +159,11 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
#endif
%define platform linux-g++
+%ifarch %{multilib_archs}
+%if "%{?__isa_bits}" == "64"
+%define platform linux-g++-64
+%endif
+%endif
sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" \
mkspecs/%{platform}/qmake.conf
@@ -471,9 +476,6 @@ popd
%changelog
-* Fri Apr 19 2013 Rex Dieter <rdieter at fedoraproject.org> 5.0.2-5
-- use platform linux-g++ everywhere
-
* Thu Apr 18 2013 Rex Dieter <rdieter at fedoraproject.org> 5.0.2-4
- respin lowmem patch to apply (unconditionally) to gcc-4.7.2 too
More information about the scm-commits
mailing list