rpms/qt4-qsa/FC-5 qsa-1.2.1-Qt4.2-preview.patch, NONE, 1.1 qt4-qsa.spec, 1.3, 1.4

[Rex Dieter]

Frank Büttner (frankb) wrote:

> Author: frankb
> 
> Update of /cvs/extras/rpms/qt4-qsa/FC-5
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106
> 
> Modified Files:
> qt4-qsa.spec
> Added Files:
> qsa-1.2.1-Qt4.2-preview.patch
> Log Message:
> - fix build for EMT64
> - Try to bypass the broken paths in the Qt4 package.
>   Not nice, but no other way until the Qt4 package will be corrected.
> - compile QSA with Qt 4.2
> 
> 
> qsa-1.2.1-Qt4.2-preview.patch:
> 
> --- NEW FILE qsa-1.2.1-Qt4.2-preview.patch ---
> --- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.preview       2006-02-28
> 07:21:15.000000000 -0600
> +++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp       2006-08-01
> 06:34:07.000000000 -0500 @@ -372,6 +372,8 @@
>          qtLicense = Universal;
>      } else if (qtEdition == QLatin1String("OpenSource")) {
>          qtLicense = GPL;
> +    } else if (qtEdition == QLatin1String("Preview")) {
> +        qtLicense = GPL;
>      } else {
>          message(QLatin1String("\nQSA is not compatible with your Qt
>          edition\n")); return false;
> 
> 
> Index: qt4-qsa.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- qt4-qsa.spec      30 Jul 2006 00:56:35 -0000      1.3
> +++ qt4-qsa.spec      12 Oct 2006 18:40:01 -0000      1.4
> @@ -1,19 +1,28 @@
... 
>  %define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX)
> -%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS)
> -%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
> +
> +# fix the the broken include path
> +%define qtinc %{qtdir}/include
> +%ifarch x86_64
> +%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
> +%else
> +%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
> +%endif

You're using directories that don't exist and/or won't ever get used here. 
qt4 now installs-to/uses %_libdir not %_libdir/qt4/%_lib

I sent you a qsa-x11-opensource-1.2.1-QT_INSTALL.patch that addresses this
awhile back.

-- Rex