- updated to 1.0.7

- updated link patch, added storage-file patch
- use new modular build option, less devel deps

Changed files:
    redland.spec -> 1.43

diff --git a/redland.spec b/redland.spec
index 5e2adb49772565494c08c6b93c65e590474df438..730c610f76ab300ebdd211f46386467db3496905 100644 (file)
--- a/redland.spec
+++ b/redland.spec
@@ -5,13 +5,14 @@
 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.6
-Release:       4
-License:       LGPL v2.1+ or GPL v2+ or Apache v2
+Version:       1.0.7
+Release:       1
+License:       LGPL v2.1+ or GPL v2+ or Apache 2.0
 Group:         Libraries
 Source0:       http://download.librdf.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 901bf87252658c8b247dc6eda00f8724
+# Source0-md5: 4c066d3dcf6c25f8fb8c9007e73f293c
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-storage-file.patch
 URL:           http://librdf.org/
 %if %{with threestore}
 BuildRequires: 3store-devel >= 2.0
@@ -21,18 +22,19 @@ BuildRequires:      autoconf >= 2.53
 BuildRequires: automake >= 1:1.7
 BuildRequires: db-devel
 BuildRequires: gtk-doc
-BuildRequires: libraptor-devel >= 1.4.15
+BuildRequires: libltdl-devel
+BuildRequires: libraptor-devel >= 1.4.16
 BuildRequires: libtool
 BuildRequires: mysql-devel >= 3.23.58
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pkgconfig
 BuildRequires: postgresql-devel
-BuildRequires: rasqal-devel >= 1:0.9.14
+BuildRequires: rasqal-devel >= 1:0.9.15
 BuildRequires: rpmbuild(macros) >= 1.98
 BuildRequires: sed >= 4.0
 BuildRequires: sqlite3-devel >= 3
-Requires:      libraptor >= 1.4.15
-Requires:      rasqal >= 1:0.9.14
+Requires:      libraptor >= 1.4.16
+Requires:      rasqal >= 1:0.9.15
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,16 +61,10 @@ Summary:    Headers for Redland RDF library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Redland RDF
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%if %{with threestore}
-Requires:      3store-devel >= 2.0
-Requires:      3store-devel < 3.0
-%endif
 Requires:      db-devel
-Requires:      libraptor-devel >= 1.4.15
-Requires:      mysql-devel >= 3.23.58
-Requires:      postgresql-devel
-Requires:      rasqal-devel >= 1:0.9.14
-Requires:      sqlite3-devel >= 3
+Requires:      libltdl-devel
+Requires:      libraptor-devel >= 1.4.16
+Requires:      rasqal-devel >= 1:0.9.15
 
 %description devel
 Headers for Redland RDF library.
@@ -88,22 +84,62 @@ Static Redland RDF library.
 %description static -l pl.UTF-8
 Statyczna biblioteka Redland RDF.
 
-%package -n python-redland
-Summary:       Python bindings for Redland RDF library
-Summary(pl.UTF-8):     Pythonowy interfejs do biblioteki Redland RDF
-Group:         Libraries/Python
+%package storage-mysql
+Summary:       MySQL storage plugin for Redland RDF library
+Summary(pl.UTF-8):     Wtyczka przechowywania danych w bazie MySQL dla biblioteki Redland RDF
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description storage-mysql
+MySQL storage plugin for Redland RDF library.
+
+%description storage-mysql -l pl.UTF-8
+Wtyczka przechowywania danych w bazie MySQL dla biblioteki Redland
+RDF.
+
+%package storage-postgresql
+Summary:       PostgreSQL storage plugin for Redland RDF library
+Summary(pl.UTF-8):     Wtyczka przechowywania danych w bazie PostgreSQL dla biblioteki Redland RDF
+Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-%pyrequires_eq python
 
-%description -n python-redland
-Python bindings for Redland RDF library
+%description storage-postgresql
+PostgreSQL storage plugin for Redland RDF library.
 
-%description -n python-redland -l pl.UTF-8
-Pythonowy interfejs do biblioteki Redland RDF
+%description storage-postgresql -l pl.UTF-8
+Wtyczka przechowywania danych w bazie PostgreSQL dla biblioteki
+Redland RDF.
+
+%package storage-sqlite
+Summary:       SQLite storage plugin for Redland RDF library
+Summary(pl.UTF-8):     Wtyczka przechowywania danych w bazie SQLite dla biblioteki Redland RDF
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description storage-sqlite
+SQLite storage plugin for Redland RDF library.
+
+%description storage-sqlite -l pl.UTF-8
+Wtyczka przechowywania danych w bazie SQLite dla biblioteki Redland
+RDF.
+
+%package storage-tstore
+Summary:       3store storage plugin for Redland RDF library
+Summary(pl.UTF-8):     Wtyczka przechowywania danych w bazie 3store dla biblioteki Redland RDF
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description storage-tstore
+3store storage plugin for Redland RDF library.
+
+%description storage-tstore -l pl.UTF-8
+Wtyczka przechowywania danych w bazie 3store dla biblioteki Redland
+RDF.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's,bdbc_prefix/lib$,bdbc_prefix/%{_lib},' configure.ac
 
@@ -115,10 +151,11 @@ sed -i -e 's,bdbc_prefix/lib$,bdbc_prefix/%{_lib},' configure.ac
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-modular \
        --with-html-dir=%{_gtkdocdir} \
-       --with-threestore=%{!?with_threestore:no}%{?with_threestore:yes} \
        --with-raptor=system \
-       --with-rasqal=system
+       --with-rasqal=system \
+       --with%{!?with_threestore:out}-threestore
 
 %{__make}
 
@@ -128,6 +165,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/redland/*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,6 +180,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/redland-db-upgrade
 %attr(755,root,root) %{_libdir}/librdf.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librdf.so.0
+%dir %{_libdir}/redland
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_file.so
 %dir %{_datadir}/redland
 %{_datadir}/redland/mysql-v*.ttl
 %{_mandir}/man1/rdfproc.1*
@@ -164,3 +205,21 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/librdf.a
+
+%files storage-mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_mysql.so
+
+%files storage-postgresql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_postgresql.so
+
+%files storage-sqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_sqlite.so
+
+%if %{with threestore}
+%files storage-tstore
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/redland/librdf_storage_tstore.so
+%endif