SPECS: qt-creator.spec - fix ldconfig locations, add 64bit plugin search pa...

[djurban]

Author: djurban                      Date: Thu Mar  5 14:14:49 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix ldconfig locations, add 64bit plugin search path fixes

---- Files affected:
SPECS:
   qt-creator.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/qt-creator.spec
diff -u SPECS/qt-creator.spec:1.1 SPECS/qt-creator.spec:1.2
--- SPECS/qt-creator.spec:1.1	Thu Mar  5 14:45:26 2009
+++ SPECS/qt-creator.spec	Thu Mar  5 15:14:43 2009
@@ -5,12 +5,13 @@
 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
@@ -28,6 +29,10 @@
 %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
@@ -51,27 +56,39 @@
 
 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
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/03/05 14:14:43  djurban
+- fix ldconfig locations, add 64bit plugin search path fixes
+
 Revision 1.1  2009/03/05 13:45:26  djurban
 - initial, rel. 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt-creator.spec?r1=1.1&r2=1.2&f=u