[redland] - Update to 1.0.11
Orcan Ogetbil
oget at fedoraproject.org
Sun Oct 3 06:16:16 UTC 2010
commit 47b9ba55739b452655ddedd596da9c1690168fe8
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Sun Oct 3 02:16:12 2010 -0400
- Update to 1.0.11
.gitignore | 1 +
redland-1.0.10-linking.patch | 33 -------
redland-1.0.10-no_undefined.patch | 33 -------
redland-1.0.10-pkgconfig_requires_private.patch | 13 ---
redland-1.0.11-linking.patch | 107 +++++++++++++++++++++++
redland.spec | 15 ++--
sources | 2 +-
7 files changed, 116 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d55326a..e5b75ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
redland-1.0.10.tar.gz
+/redland-1.0.11.tar.gz
diff --git a/redland-1.0.11-linking.patch b/redland-1.0.11-linking.patch
new file mode 100644
index 0000000..742c602
--- /dev/null
+++ b/redland-1.0.11-linking.patch
@@ -0,0 +1,107 @@
+diff -rupN redland-1.0.11.old/src/Makefile.am redland-1.0.11/src/Makefile.am
+--- redland-1.0.11.old/src/Makefile.am 2010-08-03 01:52:11.000000000 -0400
++++ redland-1.0.11/src/Makefile.am 2010-10-03 02:04:02.000000000 -0400
+@@ -310,10 +310,10 @@ rdf_uri_test: rdf_uri.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_uri.c librdf.la
+
+ rdf_statement_test: rdf_statement.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la
++ $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la
+
+ rdf_model_test: rdf_model.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_model.c librdf.la
++ $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_model.c librdf.la
+
+ rdf_storage_test: rdf_storage.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_storage.c librdf.la
+@@ -334,7 +334,7 @@ rdf_concepts_test: rdf_concepts.c librdf
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_concepts.c librdf.la
+
+ rdf_query_test: rdf_query.c rdf_query_results.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la
++ $(COMPILE_LINK) -lraptor -lrasqal -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la
+
+ rdf_serializer_test: rdf_serializer.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_serializer.c librdf.la
+@@ -349,7 +349,7 @@ rdf_avltree_test: rdf_avltree.c librdf.l
+ $(COMPILE_LINK) -DLIBRDF_DEBUG=2 -DSTANDALONE $(srcdir)/rdf_avltree.c librdf.la
+
+ rdf_init_test: rdf_init.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_init.c librdf.la
++ $(COMPILE_LINK) -lrasqal -DSTANDALONE $(srcdir)/rdf_init.c librdf.la
+
+ @SET_MAKE@
+
+diff -rupN redland-1.0.11.old/src/Makefile.in redland-1.0.11/src/Makefile.in
+--- redland-1.0.11.old/src/Makefile.in 2010-09-25 01:07:21.000000000 -0400
++++ redland-1.0.11/src/Makefile.in 2010-10-03 02:04:17.000000000 -0400
+@@ -1405,10 +1405,10 @@ rdf_uri_test: rdf_uri.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_uri.c librdf.la
+
+ rdf_statement_test: rdf_statement.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la
++ $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_statement.c librdf.la
+
+ rdf_model_test: rdf_model.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_model.c librdf.la
++ $(COMPILE_LINK) -lraptor -DSTANDALONE $(srcdir)/rdf_model.c librdf.la
+
+ rdf_storage_test: rdf_storage.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_storage.c librdf.la
+@@ -1429,7 +1429,7 @@ rdf_concepts_test: rdf_concepts.c librdf
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_concepts.c librdf.la
+
+ rdf_query_test: rdf_query.c rdf_query_results.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la
++ $(COMPILE_LINK) -lraptor -lrasqal -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la
+
+ rdf_serializer_test: rdf_serializer.c librdf.la
+ $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_serializer.c librdf.la
+@@ -1444,7 +1444,7 @@ rdf_avltree_test: rdf_avltree.c librdf.l
+ $(COMPILE_LINK) -DLIBRDF_DEBUG=2 -DSTANDALONE $(srcdir)/rdf_avltree.c librdf.la
+
+ rdf_init_test: rdf_init.c librdf.la
+- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_init.c librdf.la
++ $(COMPILE_LINK) -lrasqal -DSTANDALONE $(srcdir)/rdf_init.c librdf.la
+
+ @SET_MAKE@
+
+diff -rupN redland-1.0.11.old/utils/Makefile.am redland-1.0.11/utils/Makefile.am
+--- redland-1.0.11.old/utils/Makefile.am 2010-08-29 22:04:01.000000000 -0400
++++ redland-1.0.11/utils/Makefile.am 2010-10-03 01:44:43.000000000 -0400
+@@ -28,12 +28,13 @@ AM_LDFLAGS=@LIBRDF_LDFLAGS@
+ redland_db_upgrade_SOURCES = db_upgrade.c
+
+ redland_virtuoso_test_SOURCES = redland-virtuoso-test.c
+-redland_virtuoso_test_LDADD=@LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la
++redland_virtuoso_test_LDADD= -lraptor @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la
+
+ rdfproc_SOURCES = rdfproc.c
+ if GETOPT
+ rdfproc_SOURCES += getopt.c rdfproc_getopt.h
+ endif
++rdfproc_LDADD = -lraptor
+
+ mysql-utils: $(MYSQL_UTILS)
+
+diff -rupN redland-1.0.11.old/utils/Makefile.in redland-1.0.11/utils/Makefile.in
+--- redland-1.0.11.old/utils/Makefile.in 2010-09-25 01:07:21.000000000 -0400
++++ redland-1.0.11/utils/Makefile.in 2010-10-03 01:43:51.000000000 -0400
+@@ -65,7 +65,7 @@ am__rdfproc_SOURCES_DIST = rdfproc.c get
+ @GETOPT_TRUE at am__objects_1 = getopt.$(OBJEXT)
+ am_rdfproc_OBJECTS = rdfproc.$(OBJEXT) $(am__objects_1)
+ rdfproc_OBJECTS = $(am_rdfproc_OBJECTS)
+-rdfproc_LDADD = $(LDADD)
++rdfproc_LDADD = -lraptor $(LDADD)
+ rdfproc_DEPENDENCIES = $(top_builddir)/src/librdf.la
+ am_redland_db_upgrade_OBJECTS = db_upgrade.$(OBJEXT)
+ redland_db_upgrade_OBJECTS = $(am_redland_db_upgrade_OBJECTS)
+@@ -325,7 +325,7 @@ LDADD = $(top_builddir)/src/librdf.la
+ AM_LDFLAGS = @LIBRDF_LDFLAGS@
+ redland_db_upgrade_SOURCES = db_upgrade.c
+ redland_virtuoso_test_SOURCES = redland-virtuoso-test.c
+-redland_virtuoso_test_LDADD = @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la
++redland_virtuoso_test_LDADD = -lraptor @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la
+ rdfproc_SOURCES = rdfproc.c $(am__append_1)
+ all: all-am
+
diff --git a/redland.spec b/redland.spec
index 25b507e..ee24bdf 100644
--- a/redland.spec
+++ b/redland.spec
@@ -1,6 +1,6 @@
Name: redland
-Version: 1.0.10
-Release: 8%{?dist}
+Version: 1.0.11
+Release: 1%{?dist}
Summary: RDF Application Framework
Group: System Environment/Libraries
@@ -9,12 +9,10 @@ URL: http://librdf.org/
Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch50: redland-1.0.10-pkgconfig_requires_private.patch
-Patch51: redland-1.0.10-no_undefined.patch
# Fix DSO linking. Upstream is informed and will most likely do a more
# portable fix than this simple hack in their trunk
# http://bugs.librdf.org/mantis/view.php?id=348
-Patch60: redland-1.0.10-linking.patch
+Patch60: redland-1.0.11-linking.patch
BuildRequires: curl-devel
BuildRequires: db4-devel
@@ -24,7 +22,7 @@ BuildRequires: libxml2-devel >= 2.4.0
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: raptor-devel >= 1.4.20
-BuildRequires: rasqal-devel >= 0.9.17
+BuildRequires: rasqal-devel >= 0.9.19
BuildRequires: sqlite-devel
%description
@@ -76,8 +74,6 @@ persistently with Virtuoso files or URIs.
%prep
%setup -q
-%patch50 -p1 -b .pkgconfig_requires_private
-%patch51 -p1 -b .no_undefined
%patch60 -p1 -b .dso_linking
# hack to nuke rpaths
@@ -160,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Oct 03 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.11-1
+- Update to 1.0.11
+
* Wed Sep 29 2010 jkeating - 1.0.10-8
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 9ba84fa..a4e06f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdbb9b8dc614fc09a14cd646079619e1 redland-1.0.10.tar.gz
+e1769361c907a216c6a75fc692ba412b redland-1.0.11.tar.gz
More information about the scm-commits
mailing list