- Up to 1.0.12

- Removed patch 0, seems to no longer apply
- Removed patches 2 & 3, applied upstream
- Added virtuoso storage driver subpackage

Changed files:
    redland-librdf_storage_register_factory.patch -> 1.2
    redland-link.patch -> 1.6
    redland-sqlite.patch -> 1.2
    redland-storage-file.patch -> 1.4
    redland.spec -> 1.64

diff --git a/redland-librdf_storage_register_factory.patch b/redland-librdf_storage_register_factory.patch
deleted file mode 100644 (file)
index 60a851e..0000000
--- a/redland-librdf_storage_register_factory.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ur redland-1.0.9.orig/src/Makefile.am redland-1.0.9/src/Makefile.am
---- redland-1.0.9.orig/src/Makefile.am 2009-04-13 04:01:30.000000000 +0300
-+++ redland-1.0.9/src/Makefile.am      2009-08-18 17:13:24.000000000 +0300
-@@ -119,7 +119,7 @@
- plugin_LTLIBRARIES += librdf_storage_tstore.la
- librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
- librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
--librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
-+librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
- librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -127,7 +127,7 @@
- plugin_LTLIBRARIES += librdf_storage_mysql.la
- librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
- librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
--librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
-+librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
- librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -135,7 +135,7 @@
- plugin_LTLIBRARIES += librdf_storage_sqlite.la
- librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
- librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
--librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
-+librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
- librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -143,7 +143,7 @@
- plugin_LTLIBRARIES += librdf_storage_postgresql.la
- librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
- librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
--librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
-+librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
- librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
- endif
- 
-@@ -202,7 +202,8 @@
- rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
- rdf_init_test rdf_cache_test
- 
--TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=
-+# Set the place to find storage modules for testing
-+TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=$(abs_builddir)/.libs
- 
- CLEANFILES=$(TESTS) $(local_tests) test test*.db test.rdf
- 
-diff -ur redland-1.0.9.orig/src/Makefile.in redland-1.0.9/src/Makefile.in
---- redland-1.0.9.orig/src/Makefile.in 2009-04-13 04:04:20.000000000 +0300
-+++ redland-1.0.9/src/Makefile.in      2009-08-18 17:13:24.000000000 +0300
-@@ -141,7 +141,8 @@
- librdf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(librdf_la_LDFLAGS) $(LDFLAGS) -o $@
--librdf_storage_mysql_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@     librdf.la
- am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_OBJECTS = librdf_storage_mysql_la-rdf_storage_mysql.lo
- librdf_storage_mysql_la_OBJECTS =  \
-@@ -151,7 +152,8 @@
-       $(librdf_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@     -rpath $(plugindir)
--librdf_storage_postgresql_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@        librdf.la
- am__librdf_storage_postgresql_la_SOURCES_DIST =  \
-       rdf_storage_postgresql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_OBJECTS = librdf_storage_postgresql_la-rdf_storage_postgresql.lo
-@@ -164,7 +166,8 @@
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@        -rpath \
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@        $(plugindir)
--librdf_storage_sqlite_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@    librdf.la
- am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_OBJECTS = librdf_storage_sqlite_la-rdf_storage_sqlite.lo
- librdf_storage_sqlite_la_OBJECTS =  \
-@@ -174,7 +177,8 @@
-       $(librdf_storage_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_rpath =  \
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@    -rpath $(plugindir)
--librdf_storage_tstore_la_DEPENDENCIES =
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_DEPENDENCIES =  \
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@    librdf.la
- am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@am_librdf_storage_tstore_la_OBJECTS = librdf_storage_tstore_la-rdf_storage_tstore.lo
- librdf_storage_tstore_la_OBJECTS =  \
-@@ -463,19 +467,19 @@
- @MODULAR_LIBRDF_TRUE@ $(am__append_6)
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
--@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
-+@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
- @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
- librdf_la_LIBADD = \
- @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \
-@@ -502,7 +506,9 @@
- rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
- rdf_init_test rdf_cache_test
- 
--TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=
-+
-+# Set the place to find storage modules for testing
-+TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=$(abs_builddir)/.libs
- CLEANFILES = $(TESTS) $(local_tests) test test*.db test.rdf
- AM_CPPFLAGS = @LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ \
-       @LIBRDF_EXTERNAL_CPPFLAGS@ -DPKGDATADIR="\"$(pkgdatadir)\""

diff --git a/redland-link.patch b/redland-link.patch
deleted file mode 100644 (file)
index e611b0c..0000000
--- a/redland-link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- redland-1.0.6/redland-config.in.orig       2007-05-02 07:17:27.000000000 +0200
-+++ redland-1.0.6/redland-config.in    2007-05-12 00:53:52.531481323 +0200
-@@ -133,7 +133,7 @@
- fi
- 
- if test "$echo_private_libs" = "yes"; then
--  echo @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@
-+  echo @LIBRDF_EXTERNAL_LIBS@
- fi
- 
- if test "$echo_swig" = "yes"; then
---- redland-1.0.9/src/Makefile.am.orig 2009-12-03 00:36:17.658407858 +0100
-+++ redland-1.0.9/src/Makefile.am      2009-12-03 00:37:28.227467072 +0100
-@@ -190,7 +190,7 @@
- redland.spec redland.spec.in
- 
- librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
--@LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
-+@LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
- 
- pkgdata_DATA=
- if STORAGE_MYSQL

diff --git a/redland-sqlite.patch b/redland-sqlite.patch
deleted file mode 100644 (file)
index ee38780..0000000
--- a/redland-sqlite.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-diff -ur redland-1.0.9.orig/configure.ac redland-1.0.9/configure.ac
---- redland-1.0.9.orig/configure.ac    2009-04-13 04:01:30.000000000 +0300
-+++ redland-1.0.9/configure.ac 2009-08-12 20:23:18.000000000 +0300
-@@ -675,7 +675,7 @@
-     SQLITE_CONFIG="$PKG_CONFIG sqlite"
-   fi
-   sqlite_version=`$SQLITE_CONFIG --modversion 2>/dev/null`
--  AC_DEFINE_UNQUOTED(SQLITE_API, $sqlite_api_version, [SQLite API version])
-+  AC_DEFINE_UNQUOTED(REDLAND_SQLITE_API, $sqlite_api_version, [SQLite API version])
- 
-   storages_available="$storages_available sqlite($sqlite_version)"
-   sqlite_storage_available=yes
-diff -ur redland-1.0.9.orig/src/rdf_config.h.in redland-1.0.9/src/rdf_config.h.in
---- redland-1.0.9.orig/src/rdf_config.h.in     2009-04-13 04:04:50.000000000 +0300
-+++ redland-1.0.9/src/rdf_config.h.in  2009-08-12 20:23:14.000000000 +0300
-@@ -313,7 +313,7 @@
- #undef SIZEOF_UNSIGNED_LONG_LONG
- 
- /* SQLite API version */
--#undef SQLITE_API
-+#undef REDLAND_SQLITE_API
- 
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-diff -ur redland-1.0.9.orig/src/rdf_storage_sqlite.c redland-1.0.9/src/rdf_storage_sqlite.c
---- redland-1.0.9.orig/src/rdf_storage_sqlite.c        2009-04-13 02:59:01.000000000 +0300
-+++ redland-1.0.9/src/rdf_storage_sqlite.c     2009-08-12 20:22:54.000000000 +0300
-@@ -45,7 +45,7 @@
- #include <rdf_storage.h>
- 
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
- #include <sqlite3.h>
- #define sqlite_DB sqlite3
- #define sqlite_STATEMENT sqlite3_stmt
-@@ -57,7 +57,7 @@
- #define sqlite_last_insert_rowid sqlite3_last_insert_rowid
- #endif
- 
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
- #include <sqlite.h>
- #define sqlite_DB sqlite
- #define sqlite_STATEMENT sqlite_vm
-@@ -68,11 +68,11 @@
- #endif
- 
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   #define GET_COLUMN_VALUE_TEXT(vm, col) sqlite3_column_text(vm, col)
-   #define GET_COLUMN_VALUE_INT(vm, col) sqlite3_column_int(vm, col)
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   #define GET_COLUMN_VALUE_TEXT(vm, col) (unsigned char*)pazValue[col]
-   #define GET_COLUMN_VALUE_INT(vm, col) atoi(pazValue[col])
- #endif
-@@ -791,7 +791,7 @@
-   librdf_storage_sqlite_instance* context=(librdf_storage_sqlite_instance*)storage->instance;
-   int rc=SQLITE_OK;
-   char *errmsg=NULL;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int mode=0;
- #endif
-   int db_file_exists=0;
-@@ -804,13 +804,13 @@
-   if(context->is_new && db_file_exists)
-     unlink(context->name);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   context->db=NULL;
-   rc=sqlite3_open(context->name, &context->db);
-   if(rc != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   context->db=sqlite_open(context->name, mode, &errmsg);
-   if(context->db == NULL)
-     rc=SQLITE_ERROR;
-@@ -819,7 +819,7 @@
-     librdf_log(storage->world, 0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                "SQLite database %s open failed - %s", 
-                context->name, errmsg);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     sqlite_FREE(errmsg);
- #endif
-     librdf_storage_sqlite_close(storage);
-@@ -1279,7 +1279,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -1288,7 +1288,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail,
-@@ -1328,7 +1328,7 @@
-                                       librdf_statement **statement,
-                                       librdf_node **context_node) {
-   int status=SQLITE_BUSY;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int pN;
-   const char **pazValue;   /* Column data */
-   const char **pazColName; /* Column names and datatypes */
-@@ -1342,10 +1342,10 @@
-    * SQLITE_MISUSE.
-   */
-   do {
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_step(vm);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
- #endif
-     if(status == SQLITE_BUSY) {
-@@ -1479,12 +1479,12 @@
-   if(status == SQLITE_ERROR) {
-     char *errmsg=NULL;
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1492,7 +1492,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -1583,12 +1583,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1596,7 +1596,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -1734,7 +1734,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -1743,7 +1743,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail, 
-@@ -1856,12 +1856,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -1869,7 +1869,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2180,7 +2180,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -2189,7 +2189,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &scontext->zTail,
-@@ -2303,12 +2303,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(scontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(scontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2316,7 +2316,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2360,7 +2360,7 @@
-                                               sqlite_STATEMENT *vm,
-                                               librdf_node **context_node) {
-   int status=SQLITE_BUSY;
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-   int pN;
-   const char **pazValue;   /* Column data */
-   const char **pazColName; /* Column names and datatypes */
-@@ -2374,10 +2374,10 @@
-    * SQLITE_MISUSE.
-   */
-   do {
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_step(vm);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_step(vm, &pN, &pazValue, &pazColName);
- #endif
-     if(status == SQLITE_BUSY) {
-@@ -2429,12 +2429,12 @@
-   if(status == SQLITE_ERROR) {
-     char *errmsg=NULL;
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(scontext->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2442,7 +2442,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  scontext->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2541,12 +2541,12 @@
-     char *errmsg=NULL;
-     int status;
-     
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-     status=sqlite3_finalize(icontext->vm);
-     if(status != SQLITE_OK)
-       errmsg=(char*)sqlite3_errmsg(icontext->sqlite_context->db);
- #endif
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-     status=sqlite_finalize(icontext->vm, &errmsg);
- #endif
-     if(status != SQLITE_OK) {
-@@ -2554,7 +2554,7 @@
-                  0, LIBRDF_LOG_ERROR, LIBRDF_FROM_STORAGE, NULL,
-                  "SQLite database %s finalize failed - %s (%d)", 
-                  icontext->sqlite_context->name, errmsg, status);
--#if SQLITE_API == 2
-+#if REDLAND_SQLITE_API == 2
-       sqlite_FREE(errmsg);
- #endif
-     }
-@@ -2619,7 +2619,7 @@
- 
-   LIBRDF_DEBUG2("SQLite prepare '%s'\n", request);
- 
--#if SQLITE_API == 3
-+#if REDLAND_SQLITE_API == 3
-   status=sqlite3_prepare(context->db,
-                          (const char*)request,
-                          raptor_stringbuffer_length(sb),
-@@ -2628,7 +2628,7 @@
-   if(status != SQLITE_OK)
-     errmsg=(char*)sqlite3_errmsg(context->db);
- #endif
--#if SQLITE_API == 2  
-+#if REDLAND_SQLITE_API == 2  
-   status=sqlite_compile(context->db,
-                         (const char*)request,
-                         &icontext->zTail,
-diff -ur redland-1.0.9.orig/src/win32_rdf_config.h redland-1.0.9/src/win32_rdf_config.h
---- redland-1.0.9.orig/src/win32_rdf_config.h  2009-04-08 07:31:14.000000000 +0300
-+++ redland-1.0.9/src/win32_rdf_config.h       2009-08-12 20:23:06.000000000 +0300
-@@ -249,7 +249,7 @@
- #define SIZEOF_UNSIGNED_LONG_LONG 8
- 
- /* SQLite API version */
--#define SQLITE_API 3
-+#define REDLAND_SQLITE_API 3
- 
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1

diff --git a/redland-storage-file.patch b/redland-storage-file.patch
deleted file mode 100644 (file)
index 2bb5457..0000000
--- a/redland-storage-file.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- redland-1.0.9/src/Makefile.am.old  2009-12-03 00:19:25.051648341 +0100
-+++ redland-1.0.9/src/Makefile.am      2009-12-03 00:20:01.744463692 +0100
-@@ -115,6 +115,13 @@
- 
- plugin_LTLIBRARIES = 
- 
-+if STORAGE_FILE
-+plugin_LTLIBRARIES += librdf_storage_file.la
-+librdf_storage_file_la_SOURCES = rdf_storage_file.c
-+librdf_storage_file_la_LDFLAGS = -module -avoid-version
-+librdf_storage_file_la_LIBADD = librdf.la
-+endif
-+
- if STORAGE_TSTORE
- plugin_LTLIBRARIES += librdf_storage_tstore.la
- librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c

diff --git a/redland.spec b/redland.spec
index 7a1a72c4b89540c21b00fdafc283ae3196a0057a..69a84116f2eee06042393ea646fb12e249da1d79 100644 (file)
--- a/redland.spec
+++ b/redland.spec
@@ -5,16 +5,13 @@
 Summary:       Redland - a library that provides a high-level interface for RDF
 Summary(pl.UTF-8):     Redland - biblioteka udostępniająca wysokopoziomowy interfejs do RDF
 Name:          redland
-Version:       1.0.9
-Release:       6
+Version:       1.0.12
+Release:       1
 License:       LGPL v2.1+ or GPL v2+ or Apache v2.0
 Group:         Libraries
 Source0:       http://download.librdf.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: e5ef0c29c55b4f0f5aeed7955b4d383b
-Patch0:                %{name}-link.patch
+# Source0-md5: 40f37a5ad97fdfbf984f78dcea0c6115
 Patch1:                %{name}-storage-file.patch
-Patch2:                %{name}-librdf_storage_register_factory.patch
-Patch3:                %{name}-sqlite.patch
 URL:           http://librdf.org/
 %if %{with threestore}
 BuildRequires: 3store-devel >= 2.0
@@ -138,12 +135,22 @@ Requires: %{name} = %{version}-%{release}
 Wtyczka przechowywania danych w bazie 3store dla biblioteki Redland
 RDF.
 
+%package storage-virtuoso
+Summary:       virtuoso storage plugin for Redland RDF library
+Summary(pl.UTF-8):     Wtyczka przechowywania danych w bazie virtuoso dla biblioteki Redland RDF
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description storage-virtuoso
+virtuoso storage plugin for Redland RDF library.
+
+%description storage-virtuoso -l pl.UTF-8
+Wtyczka przechowywania danych w bazie virtuoso dla biblioteki Redland
+RDF.
+
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 sed -i 's,bdbc_prefix/lib$,bdbc_prefix/%{_lib},' configure.ac
 sed -i 's,for bdbc_version in 4\.6,for bdbc_version in 4\.7 4\.6,' configure.ac
@@ -225,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/redland/librdf_storage_sqlite.so
 
+%files storage-virtuoso
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_virtuoso.so
+
 %if %{with threestore}
 %files storage-tstore
 %defattr(644,root,root,755)