[qt3] - fix multilib issue on ppc64
Than Ngo
than at fedoraproject.org
Thu Mar 10 15:15:44 UTC 2011
commit 52bfd0fac4130626f6f027ac0b26b206c768f258
Author: Than Ngo <than at redhat.com>
Date: Thu Mar 10 16:15:28 2011 +0100
- fix multilib issue on ppc64
qt.sh | 10 +++++-----
qt3.spec | 5 ++++-
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/qt.sh b/qt.sh
index f9ca654..4b298f5 100755
--- a/qt.sh
+++ b/qt.sh
@@ -1,15 +1,15 @@
# Qt initialization script (sh)
# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64,
-# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding
-# with different arches, the installed file is the one from the preferred arch. This is
-# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found
-# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe
+# ppc64. When a conflict is found between two packages corresponding with different arches,
+# the installed file is the one from the preferred arch. This is very common for executables
+# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in
+# an i386 package, the executable from x86_64 will be installe
if [ -z "${QTDIR}" ]; then
case `uname -m` in
- x86_64 | ia64 | s390x )
+ x86_64 | ia64 | s390x | ppc64)
QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;;
* )
QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;;
diff --git a/qt3.spec b/qt3.spec
index 5f7c857..525c276 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -3,7 +3,7 @@
Summary: The shared library for the Qt 3 GUI toolkit
Version: 3.3.8b
Name: qt3
-Release: 33%{?dist}
+Release: 34%{?dist}
License: QPL or GPLv2 or GPLv3
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -593,6 +593,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Mar 10 2011 Than Ngo <than at redhat.com> - 3.3.8b-34
+- fix multilib issue on ppc64
+
* Sun Jan 30 2011 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-33
- cstddef patch (for gcc-4.6)
More information about the scm-commits
mailing list