diff --git a/qt.csh b/qt.csh index 93fd941..7497099 100755 --- a/qt.csh +++ b/qt.csh @@ -1,10 +1,10 @@ # Qt initialization script (csh) # 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 ( $?QTDIR ) then exit @@ -14,6 +14,8 @@ switch (`uname -m`) case x86_64: case ia64: case s390x: + case ppc64: + case ppc64le: set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" breaksw case *: diff --git a/qt.sh b/qt.sh index 4b298f5..df8d24e 100755 --- a/qt.sh +++ b/qt.sh @@ -9,7 +9,7 @@ if [ -z "${QTDIR}" ]; then case `uname -m` in - x86_64 | ia64 | s390x | ppc64) + x86_64 | ia64 | s390x | ppc64 | ppc64le) 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 50681b3..6ff2015 100644 --- a/qt3.spec +++ b/qt3.spec @@ -6,7 +6,7 @@ Name: qt3 Summary: The shared library for the Qt 3 GUI toolkit Version: 3.3.8b -Release: 56%{?dist} +Release: 57%{?dist} License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -633,6 +633,10 @@ rm -rf %{buildroot} %changelog +* Sun Feb 23 2014 Kevin Kofler - 3.3.8b-57 +- add ppc64le support to qt.sh and qt.csh (#1068898) +- fix ppc64 support in qt.csh + * Tue Jan 14 2014 Kevin Kofler - 3.3.8b-56 - work around -Werror=format-security false positives (#1037297)