rpms/qt4/devel qt4.spec,1.83,1.84

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15725

Modified Files:
	qt4.spec 
Log Message:
* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
- %qt_datadir: %_datadir/qt4 -> %_libdir/qt4



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qt4.spec	30 Jan 2008 14:27:50 -0000	1.83
+++ qt4.spec	15 Feb 2008 15:52:11 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv2 with exceptions or QPL
@@ -70,7 +70,9 @@
 # See http://bugzilla.redhat.com/196901
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
-%define _qt4_datadir %{_datadir}/qt4
+# _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
+#define _qt4_datadir %{_datadir}/qt4
+%define _qt4_datadir %{_qt4_prefix}
 %define _qt4_demosdir %{_qt4_prefix}/demos
 %define _qt4_docdir %{_docdir}/qt4
 %define _qt4_examplesdir %{_qt4_prefix}/examples
@@ -78,7 +80,7 @@
 %define _qt4_libdir %{_libdir}
 %define _qt4_plugindir %{_qt4_prefix}/plugins
 %define _qt4_sysconfdir %{_sysconfdir}
-%define _qt4_translationdir %{_qt4_datadir}/translations
+%define _qt4_translationdir %{_datadir}/qt4/translations
 
 %if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
@@ -409,16 +411,15 @@
   install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
   ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
   ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
-%endif
 
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}"
-# multilib: mkspecs.  TODO: consider moving this to ifarch multilib_archs block above
+# multilib: mkspecs hacks, unfortunately, breaks some stuff
   mkdir %{buildroot}%{_qt4_prefix}/mkspecs
   mv %{buildroot}%{_qt4_datadir}/mkspecs/{default,linux-g++*,qconfig.pri} \
      %{buildroot}%{_qt4_prefix}/mkspecs/
   ln -s %{_qt4_datadir}/mkspecs/common %{buildroot}%{_qt4_prefix}/mkspecs/common
 %endif
-
+%endif
 
 # qt4.(sh|csh), currently unused
 #install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/%{name}-%{_arch}.sh
@@ -527,7 +528,11 @@
 %endif
 %dir %{_qt4_prefix}
 %dir %{_qt4_bindir}
+%if "%{_qt4_datadir}" != "%{_datadir}/qt4"
+%dir %{_datadir}/qt4
+%else
 %dir %{_qt4_datadir}
+%endif
 %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
 %dir %{_qt4_sysconfdir}
 %endif
@@ -652,6 +657,9 @@
 
 
 %changelog
+* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
+- %%qt_datadir: %%_datadir/qt4 -> %%_libdir/qt4
+
 * Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-6
 - qt-copy 20080130 patch set (helps address previous 0180-window-role BIC)
 - Trolltech.conf: (default) fontsize=10