qt: Fix build for x86_64.

diff --git a/qt/qt.nm b/qt/qt.nm
index b9a952fc75d7a96ec8f97bd339ec28868668f365..7df524b61f1eff842f186a7d05c17d72264e7691 100644 (file)
--- a/qt/qt.nm
+++ b/qt/qt.nm
@@ -5,7 +5,7 @@
 
 name       = qt
 version    = 4.7.0
-release    = 3
+release    = 4
 
 groups     = System/Libraries
 url        = http://www.qtsoftware.com/
@@ -44,10 +44,11 @@ build
 
        configure_options = -v \
                -prefix /usr \
-               -datadir /usr/lib/qt4 \
-               -headerdir /usr/include \
-               -plugindir /usr/lib/qt4/plugins \
-               -translationdir /usr/share/qt4/translations \
+               -libdir %{libdir} \
+               -datadir %{datadir}/qt4 \
+               -headerdir %{includedir} \
+               -plugindir %{libdir}/qt4/plugins \
+               -translationdir %{datadir}/qt4/translations \
                -confirm-license \
                -fontconfig \
                -largefile \
@@ -107,6 +108,9 @@ build
 
        prepare_cmds
                sed -e "s/-O2/%{CFLAGS}/g" -i mkspecs/*/qmake.conf
+
+               # Disable the strip command to get a useful debuginfo package.
+               sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf
        end
 
        install
@@ -116,18 +120,22 @@ end
 
 packages
        package %{name}
+
+       package %{name}-libs
+               template LIBS
+
+               files += %{libdir}/qt4/plugins
+               files += %{datadir}/qt4/phrasebooks
+               files += %{datadir}/qt4/translations
        end
 
        package %{name}-devel
                template DEVEL
 
-               files
-                       /usr/lib/*.prl \
-                       /usr/lib/qt4/q3porting.xml \
-                       /usr/bin \
-                       /usr/lib/qt4/*.prl \
-                       /usr/lib/qt4/mkspecs
-               end
+               files += %{libdir}/*.prl
+               files += %{libdir}/qt4/q3porting.xml
+               files += %{libdir}/qt4/*.prl
+               files += %{datadir}/qt4/mkspecs
        end
 
        package %{name}-debuginfo