maj de redland#1.0.10-4

4 files changed, 36 insertions, 5 deletions

diff --git a/kde/redland/.footprint b/kde/redland/.footprint
index 47be8756a..55b10d241 100644
--- a/kde/redland/.footprint
+++ b/kde/redland/.footprint
@@ -34,6 +34,9 @@ lrwxrwxrwx	root/root	usr/lib/librdf.so.0 -> librdf.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/redland.pc
 drwxr-xr-x	root/root	usr/lib/redland/
+-rw-r--r--	root/root	usr/lib/redland/librdf_storage_mysql.a
+-rwxr-xr-x	root/root	usr/lib/redland/librdf_storage_mysql.la
+-rwxr-xr-x	root/root	usr/lib/redland/librdf_storage_mysql.so
 -rw-r--r--	root/root	usr/lib/redland/librdf_storage_postgresql.a
 -rwxr-xr-x	root/root	usr/lib/redland/librdf_storage_postgresql.la
 -rwxr-xr-x	root/root	usr/lib/redland/librdf_storage_postgresql.so
@@ -53,3 +56,5 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/redland.3.gz
 drwxr-xr-x	root/root	usr/share/redland/
 -rw-r--r--	root/root	usr/share/redland/Redland.i
+-rw-r--r--	root/root	usr/share/redland/mysql-v1.ttl
+-rw-r--r--	root/root	usr/share/redland/mysql-v2.ttl
diff --git a/kde/redland/.md5sum b/kde/redland/.md5sum
index 9ba84fa5c..d7f68e69e 100644
--- a/kde/redland/.md5sum
+++ b/kde/redland/.md5sum
@@ -1 +1,2 @@
+1044ffc635f5c0ad16a00e18491ee588  librdf_storage_register_factory.patch
 bdbb9b8dc614fc09a14cd646079619e1  redland-1.0.10.tar.gz
diff --git a/kde/redland/Pkgfile b/kde/redland/Pkgfile
index 0075401b6..a79253c88 100755
--- a/kde/redland/Pkgfile
+++ b/kde/redland/Pkgfile
@@ -2,22 +2,26 @@
 # URL: http://download.librdf.org/source/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: raptor, db, rasqal, sqlite3, unixodbc, mpfr, libpostgresql
+# Depends on: raptor, db, rasqal, sqlite3, unixodbc, mpfr, libpostgresql, mysqlclient, curl
 
 name=redland
 version=1.0.10
-release=3
-source=(http://download.librdf.org/source/$name-$version.tar.gz)
+release=5
+source=(http://download.librdf.org/source/$name-$version.tar.gz
+	librdf_storage_register_factory.patch)
+
 build() {
 	cd $name-$version
+	patch -p1 -i ../librdf_storage_register_factory.patch
 	sed -i -e '/SHAVE/d' configure.ac
+	autoreconf
 	./configure --prefix=/usr \
+		--enable-release \
 		--sysconfdir=/etc \
 		--with-raptor=system \
 		--with-rasqual=system \
-		--with-mysql=no \
 		--with-sqlite=3
-	sed -i "s|librdf_storage_virtuoso_la_LIBADD = -lodbc|librdf_storage_virtuoso_la_LIBADD = -lodbc librdf.la|" src/Makefile
+#	sed -i "s|librdf_storage_virtuoso_la_LIBADD = -lodbc|librdf_storage_virtuoso_la_LIBADD = -lodbc librdf.la|" src/Makefile
 	make
 	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/share/gtk-doc
diff --git a/kde/redland/librdf_storage_register_factory.patch b/kde/redland/librdf_storage_register_factory.patch
new file mode 100644
index 000000000..9d99bbee2
--- /dev/null
+++ b/kde/redland/librdf_storage_register_factory.patch
@@ -0,0 +1,21 @@
+From: Dave Beckett <dave@dajobe.org>
+Date: Fri, 18 Dec 2009 16:03:31 +0000 (+0000)
+Subject: Add librdf.la to librdf_storage_virtuoso_la_LIBADD
+X-Git-Url: http://git.librdf.org/view?p=librdf.git;a=commitdiff_plain;h=bfeaca74108e5a1e0c8143b2dc4c36f23e78f311;hp=5dfe6dc3361cccdf47a9db32bfa8374d405ad1e4
+
+Add librdf.la to librdf_storage_virtuoso_la_LIBADD
+---
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6bb4aa0..fcbe149 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -152,7 +152,7 @@ if STORAGE_VIRTUOSO
+ plugin_LTLIBRARIES += librdf_storage_virtuoso.la 
+ librdf_storage_virtuoso_la_SOURCES = rdf_storage_virtuoso.c rdf_storage_virtuoso_internal.h
+ librdf_storage_virtuoso_la_CPPFLAGS = @ODBC_CFLAGS@
+-librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@
++librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la
+ librdf_storage_virtuoso_la_LDFLAGS = -module -avoid-version
+ endif
+