From f421327d63c71864131f8221d8ead63eb2f07c19 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sun, 3 Jan 2010 22:45:04 +0000
Subject: [PATCH] - redland-1.0.10

---
 .cvsignore   |  2 +-
 redland.spec | 68 ++++++++++++++++++++++++++++++----------------------
 sources      |  2 +-
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f4e8cfb..d55326a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-redland-1.0.7.tar.gz
+redland-1.0.10.tar.gz
diff --git a/redland.spec b/redland.spec
index 9369e40..e85944e 100644
--- a/redland.spec
+++ b/redland.spec
@@ -1,23 +1,23 @@
 Name:           redland
-Version:        1.0.7
-Release:        10%{?dist}.2
+Version:        1.0.10
+Release:        1%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
 License:        LGPLv2+ or ASL 2.0
 URL:            http://librdf.org/
-Source:         http://download.librdf.org/source/%{name}-%{version}.tar.gz
+Source0:        http://download.librdf.org/source/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel >= 2.4.0
 BuildRequires:  curl-devel
-BuildRequires:  rasqal-devel >= 0.9.15
-BuildRequires:  raptor-devel >= 1.4.16
 BuildRequires:  db4-devel
-#BuildRequires:  mysql-devel
-BuildRequires:  sqlite-devel
+BuildRequires:  libiodbc-devel
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
-BuildRequires:  gtk-doc
+BuildRequires:  raptor-devel >= 1.4.20
+BuildRequires:  rasqal-devel >= 0.9.17
+BuildRequires:  sqlite-devel
 
 %description
 Redland is a library that provides a high-level interface for RDF
@@ -31,13 +31,14 @@ for RDF developers to experiment with the technology.
 Summary:         Libraries and header files for programs that use Redland
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        raptor-devel >= 1.4.16
-Requires:        rasqal-devel >= 0.9.15
+Requires:        gtk-doc
 Requires:        pkgconfig
-
+Requires:        raptor-devel
+Requires:        rasqal-devel
 %description     devel
 Header files for development with Redland.
 
+
 %prep
 %setup -q
 
@@ -46,33 +47,31 @@ Header files for development with Redland.
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
-# hack around SQLITE_API macro collision with newer sqlite
-sed -i.REDLAND_SQLITE_API -e "s|SQLITE_API|REDLAND_SQLITE_API|" \
-  configure.ac configure librdf/rdf_config.h.in librdf/rdf_storage_sqlite.c
-
-
 %build
-# disable-static does not work if we override to use the system's libtool
 %configure \
   --enable-release \
-  --with-raptor=system --with-rasqal=system --with-threestore=no \
   --disable-static
 
 make %{?_smp_mflags}
 
-%check
-make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+#unpackaged files
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
 
+%check
+make check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE.txt NEWS README
@@ -82,29 +81,40 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rdfproc
 %{_bindir}/redland-db-upgrade
 %dir %{_datadir}/redland
-#{_datadir}/redland/mysql-v1.ttl
-#{_datadir}/redland/mysql-v2.ttl
+%{_datadir}/redland/mysql-v1.ttl
+%{_datadir}/redland/mysql-v2.ttl
 %{_mandir}/man1/redland-db-upgrade.1*
 %{_mandir}/man1/rdfproc.1*
 %{_mandir}/man3/redland.3*
+%dir %{_libdir}/redland
+# these could be split out now
+%{_libdir}/redland/librdf_storage_mysql.so
+%{_libdir}/redland/librdf_storage_postgresql.so
+%{_libdir}/redland/librdf_storage_sqlite.so
+%{_libdir}/redland/librdf_storage_virtuoso.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/redland-config
-%{_libdir}/librdf.so
+%{_datadir}/redland/Redland.i
+%{_datadir}/gtk-doc/html/redland/
 %{_includedir}/redland.h
-%{_includedir}/librdf.h 
+%{_includedir}/librdf.h
 %{_includedir}/rdf_*.h
-%{_mandir}/man1/redland-config.1*
+%{_libdir}/librdf.so
 %{_libdir}/pkgconfig/redland.pc
-%{_datadir}/redland/Redland.i
-%{_datadir}/gtk-doc/html/redland/
+%{_mandir}/man1/redland-config.1*
+
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %changelog
+* Sun Jan 03 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.10-1
+- redland-1.0.10
+
 * Tue Nov 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.0.7-10.2
 - Resolves: rhbz#540519 Rebuild against db4-4.8
 
diff --git a/sources b/sources
index b704b4b..9ba84fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c066d3dcf6c25f8fb8c9007e73f293c  redland-1.0.7.tar.gz
+bdbb9b8dc614fc09a14cd646079619e1  redland-1.0.10.tar.gz