Hello community, here is the log from the commit of package soprano checked in at Tue Dec 18 18:57:14 CET 2007. -------- --- soprano/soprano.changes 2007-12-16 23:02:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/soprano/soprano.changes 2007-12-18 13:38:10.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 18 13:03:03 CET 2007 - stbinner@suse.de + +- fix plugin loading on 64bit architectures + +------------------------------------------------------------------- New: ---- r749960.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soprano.spec ++++++ --- /var/tmp/diff_new_pack.Xw2574/_old 2007-12-18 18:56:46.000000000 +0100 +++ /var/tmp/diff_new_pack.Xw2574/_new 2007-12-18 18:56:46.000000000 +0100 @@ -21,8 +21,9 @@ Summary: C++/Qt based interface library for RDF BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.99 -Release: 2 +Release: 4 Source: %name-%{version}-rc2.tar.bz2 +Patch: r749960.diff %description Soprano is an open and pluggable RDF resource framework which is build @@ -76,6 +77,7 @@ %prep %setup -q -n %name-%version-rc2 +%patch %build %cmake_kde4 -d build @@ -131,6 +133,8 @@ %_libdir/pkgconfig/soprano.pc %changelog +* Tue Dec 18 2007 - stbinner@suse.de +- fix plugin loading on 64bit architectures * Sun Dec 16 2007 - stbinner@suse.de - readd redland as build requirement * Mon Dec 10 2007 - dmueller@suse.de ++++++ r749960.diff ++++++ Index: soprano/pluginmanager.cpp =================================================================== --- soprano/pluginmanager.cpp (revision 749959) +++ soprano/pluginmanager.cpp (revision 749960) @@ -111,12 +111,16 @@ return lib; } else { - // using the same prefix should be sufficient - lib.prepend( file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ) + "lib/soprano/" ); - qDebug() << lib; - if ( QFile::exists( lib ) ) { - return lib; + QString basePath = file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ); + if ( QFile::exists( basePath + "lib"SOPRANO_LIB_SUFFIX"/soprano/" + lib ) ) { + return basePath + "lib"SOPRANO_LIB_SUFFIX"/soprano/" + lib; } + else if ( QFile::exists( basePath + "lib/soprano/" + lib ) ) { + return basePath + "lib/soprano/" + lib; + } + else if ( QFile::exists( basePath + "lib64/soprano/" + lib ) ) { + return basePath + "lib64/soprano/" + lib; + } return QString(); } } Index: soprano/config.h.cmake =================================================================== --- soprano/config.h.cmake (revision 749959) +++ soprano/config.h.cmake (revision 749960) @@ -1,2 +1,3 @@ #define SOPRANO_LIB_DIR "${LIB_DESTINATION}" #define SOPRANO_PREFIX "${CMAKE_INSTALL_PREFIX}" +#define SOPRANO_LIB_SUFFIX "${LIB_SUFFIX}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org