- fix ldconfig locations, add 64bit plugin search path fixes

Changed files:
    qt-creator.spec -> 1.2

diff --git a/qt-creator.spec b/qt-creator.spec
index 94cebe8d2f0c5089c0d8ac32981eeda0a723d8ef..18735f75c8ac7885ea6023239e74d5e19741b812 100644 (file)
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -4,12 +4,13 @@ Summary:      An IDE tailored to the needs of Qt developers
 Summary(pl.UTF-8):     IDE dostosowane do potrzeb developerow Qt
 Name:          qt-creator
 Version:       1.0.0
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://download.qtsoftware.com/qtcreator/%{name}-%{version}-src.zip
 # Source0-md5: 5478124035d80a90e66a3db67ab4477a
+Patch0:                %{name}-pluginpath64.patch
 URL:           http://www.qtsoftware.com/developer/qt-creator
 BuildRequires: libstdc++-devel
 BuildRequires: qt4-qmake >= 4.5.0-3
@@ -27,6 +28,10 @@ Qt Creator to wieloplatformowe IDE dostosowane do potrzeb developerow Qt.
 %prep
 %setup -q -n %{name}-%{version}-src
 
+%if "%{_lib}" == "lib64"
+%patch0 -p1
+%endif
+
 %build
 export QTDIR=%{_libdir}/qt4
 # the qmakespec in qt4 is somewhat broken, need to look at this
@@ -50,17 +55,26 @@ export QTDIR=%{_libdir}/qt4
 
 mv -f $RPM_BUILD_ROOT/{%{_prefix}/lib,%{_libdir}}
 
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/qtcreator" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/qtcreator.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%{_sysconfdir}/ld.so.conf.d/qtcreator.conf
 %dir %{_libdir}/qtcreator
-%attr(755,root,root) %{_libdir}/qtcreator/lib*.so*
+%attr(755,root,root) %{_libdir}/qtcreator/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/qtcreator/lib*.so
 %dir %{_libdir}/qtcreator/plugins
 %dir %{_libdir}/qtcreator/plugins/Nokia
 %{_libdir}/qtcreator/plugins/Nokia/*.pluginspec                                                                                    
 %attr(755,root,root) %{_libdir}/qtcreator/plugins/Nokia/*.so
 %{_datadir}/qtcreator
+%{_defaultdocdir}/qtcreator
 %{_pixmapsdir}/qtcreator_logo*.png
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig