Hello community,
here is the log from the commit of package soprano
checked in at Thu Feb 21 02:01:16 CET 2008.
--------
--- soprano/soprano.changes 2008-02-14 00:25:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/soprano/soprano.changes 2008-02-18 17:49:59.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Feb 18 17:48:43 CET 2008 - dmueller@suse.de
+
+- update to 2.0.2:
+ * MutexModel in ReadWriteMultiThreading mode now allows multiple
+ read operations from the same thread at the same time even if a
+ write operation is waiting. This fixes a deadlock in the Nepomuk
+ Strigi backend from KDE.
+ * Fixed method statementCount in Sesame2 backend
+ * Redland backend: Always encode strings as xls:string rather
+ than rdfs:Literal values to match the Soprano guidelines.
+ * Always set a dummy base URI in the raptor serializer
+ * Fixed formatting of dateTime values.
+ * Fixed NRL namespace
+ * Fixed NAO namespace
+ * Fixed plugin loading on MAC OS/X
+
+-------------------------------------------------------------------
Old:
----
glibc-2.7.diff
soprano-2.0.0.tar.bz2
New:
----
soprano-2.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ soprano.spec ++++++
--- /var/tmp/diff_new_pack.fd7398/_old 2008-02-21 02:00:37.000000000 +0100
+++ /var/tmp/diff_new_pack.fd7398/_new 2008-02-21 02:00:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package soprano (Version 2.0.0)
+# spec file for package soprano (Version 2.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,10 +22,9 @@
Group: Development/Libraries/C and C++
Summary: C++/Qt based interface library for RDF
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 2.0.0
-Release: 19
+Version: 2.0.2
+Release: 1
Source: %name-%{version}.tar.bz2
-Patch0: glibc-2.7.diff
Requires: libsoprano4 >= %{version}
%description
@@ -80,7 +79,6 @@
%prep
%setup -q -n %name-%version
-%patch0
%build
%cmake_kde4 -d build
@@ -136,6 +134,20 @@
%_libdir/pkgconfig/soprano.pc
%changelog
+* Mon Feb 18 2008 dmueller@suse.de
+- update to 2.0.2:
+ * MutexModel in ReadWriteMultiThreading mode now allows multiple
+ read operations from the same thread at the same time even if a
+ write operation is waiting. This fixes a deadlock in the Nepomuk
+ Strigi backend from KDE.
+ * Fixed method statementCount in Sesame2 backend
+ * Redland backend: Always encode strings as xls:string rather
+ than rdfs:Literal values to match the Soprano guidelines.
+ * Always set a dummy base URI in the raptor serializer
+ * Fixed formatting of dateTime values.
+ * Fixed NRL namespace
+ * Fixed NAO namespace
+ * Fixed plugin loading on MAC OS/X
* Thu Feb 14 2008 dmueller@suse.de
- fix devel package requires
* Mon Jan 14 2008 dmueller@suse.de
++++++ soprano-2.0.0.tar.bz2 -> soprano-2.0.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/backends/redland/redlandutil.cpp new/soprano-2.0.2/backends/redland/redlandutil.cpp
--- old/soprano-2.0.0/backends/redland/redlandutil.cpp 2007-11-23 10:50:50.000000000 +0100
+++ new/soprano-2.0.2/backends/redland/redlandutil.cpp 2008-02-11 09:18:22.000000000 +0100
@@ -63,18 +63,10 @@
return librdf_new_node_from_blank_identifier( world, (unsigned char *) node.identifier().toUtf8().data() );
}
else if ( node.isLiteral() ) {
- if ( node.literal().isString() ) {
- return librdf_new_node_from_typed_literal( world,
- (unsigned char *)node.literal().toString().toUtf8().data(),
- node.language().toUtf8().data(),
- 0 );
- }
- else {
- return librdf_new_node_from_typed_literal( world,
- (unsigned char *)node.literal().toString().toUtf8().data(),
- 0,
- librdf_new_uri( world, (const unsigned char*)node.dataType().toEncoded().data() ) );
- }
+ return librdf_new_node_from_typed_literal( world,
+ (unsigned char *)node.literal().toString().toUtf8().data(),
+ node.language().toUtf8().data(),
+ librdf_new_uri( world, (const unsigned char*)node.dataType().toEncoded().data() ) );
}
return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/backends/sesame2/sesame2repositoryconnection.cpp new/soprano-2.0.2/backends/sesame2/sesame2repositoryconnection.cpp
--- old/soprano-2.0.0/backends/sesame2/sesame2repositoryconnection.cpp 2007-12-12 19:02:13.000000000 +0100
+++ new/soprano-2.0.2/backends/sesame2/sesame2repositoryconnection.cpp 2008-01-08 21:19:34.000000000 +0100
@@ -207,7 +207,8 @@
long Soprano::Sesame2::RepositoryConnection::size()
{
- return callLongMethod( d->IDsize() );
+ jobjectArray contexts = JNIWrapper::instance()->env()->NewObjectArray( 0, d->classResource(), 0 );
+ return callLongMethod( d->IDsize(), contexts );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/ChangeLog new/soprano-2.0.2/ChangeLog
--- old/soprano-2.0.0/ChangeLog 2007-12-12 19:02:13.000000000 +0100
+++ new/soprano-2.0.2/ChangeLog 2008-02-14 19:25:46.000000000 +0100
@@ -1,3 +1,18 @@
+2.0.2
+ * MutexModel in ReadWriteMultiThreading mode now allows multiple read operations from the same thread
+ at the same time even if a write operation is waiting. This fixes a deadlock in the Nepomuk Strigi
+ backend from KDE.
+
+2.0.1
+ * Fixed method statementCount in Sesame2 backend
+ * Redland backend: Always encode strings as xls:string rather than rdfs:Literal values to match the
+ Soprano guidelines.
+ * Always set a dummy base URI in the raptor serializer
+ * Fixed formatting of dateTime values.
+ * Fixed NRL namespace
+ * Fixed NAO namespace
+ * Fixed plugin loading on MAC OS/X
+
2.0
* LiteralValue is not derived from QVariant anymore but uses it internally
* ResultSet renamed to QueryResultIterator
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/cmake/modules/FindCLucene.cmake new/soprano-2.0.2/cmake/modules/FindCLucene.cmake
--- old/soprano-2.0.0/cmake/modules/FindCLucene.cmake 2007-10-26 09:13:59.000000000 +0200
+++ new/soprano-2.0.2/cmake/modules/FindCLucene.cmake 2008-01-14 22:59:36.000000000 +0100
@@ -22,15 +22,13 @@
/usr/local/lib${LIB_SUFFIX}
/usr/lib${LIB_SUFFIX}
/sw/lib${LIB_SUFFIX}
- NO_DEFAULT_PATH
- )
+ )
SET(TRIAL_INCLUDE_PATHS
$ENV{CLUCENE_HOME}/include
${CMAKE_INSTALL_PREFIX}/include
/usr/local/include
/usr/include
/sw/include
- NO_DEFAULT_PATH
)
FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
WIN32_DEBUG_POSTFIX d
@@ -52,7 +50,7 @@
ENDIF(WIN32)
FIND_PATH(CLUCENE_LIBRARY_DIR
- NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS})
+ NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
IF (CLUCENE_LIBRARY_DIR)
MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/CMakeLists.txt new/soprano-2.0.2/CMakeLists.txt
--- old/soprano-2.0.0/CMakeLists.txt 2008-01-07 10:29:32.000000000 +0100
+++ new/soprano-2.0.2/CMakeLists.txt 2008-02-14 20:45:47.000000000 +0100
@@ -2,7 +2,7 @@
set(CMAKE_SOPRANO_VERSION_MAJOR 2 CACHE INT "Major Soprano version number" FORCE)
set(CMAKE_SOPRANO_VERSION_MINOR 0 CACHE INT "Minor Soprano version number" FORCE)
-set(CMAKE_SOPRANO_VERSION_RELEASE 0 CACHE INT "Release Soprano version number" FORCE)
+set(CMAKE_SOPRANO_VERSION_RELEASE 2 CACHE INT "Release Soprano version number" FORCE)
set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}" CACHE STRING "Soprano version string" FORCE)
enable_testing()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/serializers/raptor/raptorserializer.cpp new/soprano-2.0.2/serializers/raptor/raptorserializer.cpp
--- old/soprano-2.0.0/serializers/raptor/raptorserializer.cpp 2007-11-22 18:53:30.000000000 +0100
+++ new/soprano-2.0.2/serializers/raptor/raptorserializer.cpp 2008-02-11 09:21:28.000000000 +0100
@@ -197,8 +197,11 @@
return false;
}
+ librdf_uri* baseUri = librdf_new_uri( Redland::World::self()->worldPtr(),
+ ( const unsigned char* )"http://soprano.org/FIXME/WeNeedABaseUriParameter" );
+
if ( librdf_serializer_serialize_stream_to_iostream( serializer,
- 0,
+ baseUri,
rdfStream,
raptorStream ) ) {
qDebug() << "(Soprano::Raptor::Serializer) serialization failed.";
@@ -206,6 +209,7 @@
success = false;
}
+ librdf_free_uri( baseUri );
librdf_free_stream( rdfStream );
librdf_free_serializer( serializer );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/server/lockfile.cpp new/soprano-2.0.2/server/lockfile.cpp
--- old/soprano-2.0.0/server/lockfile.cpp 2007-11-22 11:09:02.000000000 +0100
+++ new/soprano-2.0.2/server/lockfile.cpp 2008-01-14 18:05:12.000000000 +0100
@@ -84,7 +84,7 @@
f.setPermissions( f.permissions() | QFile::WriteOwner );
}
- d->fd = open( QFile::encodeName( d->path ).data(), O_WRONLY|O_CREAT );
+ d->fd = open( QFile::encodeName( d->path ).data(), O_WRONLY|O_CREAT, 0600 );
if ( d->fd == -1 ) {
qDebug() << "(LockFile) could not open" << d->path << QString( "(%1)" ).arg( strerror( errno ) );
return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/server/Mainpage.dox new/soprano-2.0.2/server/Mainpage.dox
--- old/soprano-2.0.0/server/Mainpage.dox 2008-01-02 12:21:06.000000000 +0100
+++ new/soprano-2.0.2/server/Mainpage.dox 2008-01-11 09:02:35.000000000 +0100
@@ -96,8 +96,7 @@
* </method>
* <method name="executeQuery">
* <arg name="query" type="s" direction="in" />
- * <arg name="queryLang" type="i" direction="in" />
- * <arg name="userQueryLang" type="s" direction="in" />
+ * <arg name="queryLang" type="s" direction="in" />
* <arg name="iterator" type="s" direction="out" />
* </method>
* <method name="createBlankNode">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/soprano/CMakeLists.txt new/soprano-2.0.2/soprano/CMakeLists.txt
--- old/soprano-2.0.0/soprano/CMakeLists.txt 2007-12-18 13:58:41.000000000 +0100
+++ new/soprano-2.0.2/soprano/CMakeLists.txt 2008-02-14 19:25:46.000000000 +0100
@@ -80,6 +80,7 @@
desktopfile.cpp
sopranopluginfile.cpp
util/looplock.cpp
+ util/extreadwritelock.cpp
util/mutexmodel.cpp
util/mutexstatementiteratorbackend.cpp
util/mutexnodeiteratorbackend.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/soprano/datetime.cpp new/soprano-2.0.2/soprano/datetime.cpp
--- old/soprano-2.0.0/soprano/datetime.cpp 2007-12-01 21:44:42.000000000 +0100
+++ new/soprano-2.0.2/soprano/datetime.cpp 2008-02-12 12:52:17.000000000 +0100
@@ -210,12 +210,7 @@
frac.truncate( frac.length() -1 );
}
- // Comma is preferred by ISO8601 as the decimal point symbol,
- // so use it unless '.' is the symbol used in this locale.
- return t.toString( "HH:mm:ss" )
- + ( QLocale::system().decimalPoint() == QChar( '.' ) ? QChar( '.' ) : QChar( ',' ) )
- + frac
- + 'Z';
+ return t.toString( "HH:mm:ss" ) + '.' + frac + 'Z';
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/soprano-2.0.0/soprano/pluginmanager.cpp new/soprano-2.0.2/soprano/pluginmanager.cpp
--- old/soprano-2.0.0/soprano/pluginmanager.cpp 2007-12-18 13:58:41.000000000 +0100
+++ new/soprano-2.0.2/soprano/pluginmanager.cpp 2008-02-13 09:28:10.000000000 +0100
@@ -1,7 +1,7 @@
/*
* This file is part of Soprano Project.
*
- * Copyright (C) 2007 Sebastian Trueg