fixes for qt on S10U5
I put the || exit 1 just in case the copy doesn't occur, cause I spent
a fair amount
of time tracking down a silent error.
Index: QT/4.4.1/Solaris/install.sh
===================================================================
--- QT/4.4.1/Solaris/install.sh (revision 2804)
+++ QT/4.4.1/Solaris/install.sh (working copy)
@@ -128,8 +128,8 @@
cp -fp src/corelib/global/${HEADER_FILE} ${QTINCDIR}/${HEADER_FILE}
cp -fp src/corelib/global/${HEADER_FILE} ${QTCOREINCDIR}/${HEADER_FILE}
- cp -fp ../Solaris/qconfig.h ${QTINCDIR}/qconfig.h
- cp -fp ../Solaris/qconfig.h ${QTCOREINCDIR}/qconfig.h
+ cp -fp Solaris/qconfig.h ${QTINCDIR}/qconfig.h || exit 1
+ cp -fp Solaris/qconfig.h ${QTCOREINCDIR}/qconfig.h || exit 1
else
echo "###"
echo "### WARNING: The ISA-specific qconfig file ${HEADER_FILE}"
Index: SPECS/qt.pspc
===================================================================
--- SPECS/qt.pspc (revision 2806)
+++ SPECS/qt.pspc (working copy)
@@ -100,11 +100,6 @@
#
#
%ifarch amd64 sparcv9
-# Having a complete set of duplicates for 64-bit includes is silly,
-# but somewhat necessary because the bitness of the build is coded in.
-%dir %attr (0755, root, bin) %{_includedir}/%_arch64
-%{_includedir}/%_arch64/*
-
%dir %attr (0755, root, bin) %{_bindir}/%_arch64
%{_bindir}/%_arch64/assistant
%{_bindir}/%_arch64/designer
@@ -146,7 +141,7 @@
%{_prefix}/plugins/%_arch64/sqldrivers/*.so
%{_prefix}/plugins/%_arch64/codecs/*.so
%{_prefix}/plugins/%_arch64/script/*.so
-#%{_prefix}/plugins/%_arch64/phonon_backend/*.so
+%{_prefix}/plugins/%_arch64/phonon_backend/*.so
%endif
%changelog
