rpms/qt/devel qt.spec,1.184,1.185 qt4-wrapper.sh,1.1,1.2
Than Ngo (than)
fedora-extras-commits at redhat.com
Tue Jun 10 13:18:53 UTC 2008
- Previous message: rpms/iptables/devel iptables-1.4.1-cloexec.patch, NONE, 1.1 iptables-1.4.1-ipv6_network_mask.patch, NONE, 1.1 iptables-1.4.1-nf_ext_init.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 iptables.spec, 1.69, 1.70 sources, 1.21, 1.22 iptables-1.3.8-iptc.patch, 1.1, NONE iptables-1.4.0-cloexec.patch, 1.2, NONE iptables-1.4.0-in6_u.patch, 1.1, NONE iptables-1.4.0-use-normal-kernel-headers.patch, 1.1, NONE
- Next message: rpms/ypbind/devel ypbind.init,1.20,1.21 ypbind.spec,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913
Modified Files:
qt.spec qt4-wrapper.sh
Log Message:
fix #450310, multilib issue
Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- qt.spec 6 Jun 2008 15:59:50 -0000 1.184
+++ qt.spec 10 Jun 2008 13:18:11 -0000 1.185
@@ -11,7 +11,7 @@
Name: qt4
%endif
Version: 4.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL
@@ -788,6 +788,9 @@
%changelog
+* Tue Jun 10 2008 Than Ngo <than at redhat.com> 4.4.0-7
+- fix #450310, multilib issue
+
* Fri Jun 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-6
- qt-copy-patches-20080606
- drop BR: libungif-devel (not used)
Index: qt4-wrapper.sh
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt4-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4-wrapper.sh 12 Mar 2008 23:38:15 -0000 1.1
+++ qt4-wrapper.sh 10 Jun 2008 13:18:11 -0000 1.2
@@ -1,9 +1,22 @@
-#!/bin/bash
+#! /bin/bash
+#
+# 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
+
+ARCH=$(uname -m)
+QTVERSION=4
if [ -z "$QT4DIR" ] ; then
- # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way.
- QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )"
- export QT4DIR
+ case $ARCH in
+ x86_64 | ia64 | s390 )
+ QT4DIR=/usr/lib64/qt$QTVERSION ;;
+ * )
+ QT4DIR=/usr/lib/qt$QTVERSION ;;
+ esac
+ export QT4DIR
fi
if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then
- Previous message: rpms/iptables/devel iptables-1.4.1-cloexec.patch, NONE, 1.1 iptables-1.4.1-ipv6_network_mask.patch, NONE, 1.1 iptables-1.4.1-nf_ext_init.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 iptables.spec, 1.69, 1.70 sources, 1.21, 1.22 iptables-1.3.8-iptc.patch, 1.1, NONE iptables-1.4.0-cloexec.patch, 1.2, NONE iptables-1.4.0-in6_u.patch, 1.1, NONE iptables-1.4.0-use-normal-kernel-headers.patch, 1.1, NONE
- Next message: rpms/ypbind/devel ypbind.init,1.20,1.21 ypbind.spec,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list