Hello community, here is the log from the commit of package redland for openSUSE:Factory checked in at 2013-06-18 15:33:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/redland (Old) and /work/SRC/openSUSE:Factory/.redland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redland" Changes: -------- --- /work/SRC/openSUSE:Factory/redland/redland.changes 2013-01-07 17:39:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.redland.new/redland.changes 2013-06-18 15:33:06.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 15 22:37:54 UTC 2013 - [email protected] + +- Add redland-db6.diff to make it look for libdb 6.0 +- Implement shlib packaging guidelines + (rename libredland0 -> librdf0) + +------------------------------------------------------------------- New: ---- redland-db6.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redland.spec ++++++ --- /var/tmp/diff_new_pack.dBwGq0/_old 2013-06-18 15:33:06.000000000 +0200 +++ /var/tmp/diff_new_pack.dBwGq0/_new 2013-06-18 15:33:06.000000000 +0200 @@ -19,13 +19,20 @@ %bcond_with perl Name: redland +%define lname librdf0 Version: 1.0.16 Release: 0 Summary: Libraries that provide support for the Resource Description Framework (RDF) License: LGPL-2.1+ and Apache-2.0 Group: System/Libraries Url: http://www.librdf.org + Source0: http://download.librdf.org/source/%{name}-%{version}.tar.gz +%if 0%{?suse_version} >= 1210 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch1: redland-ocloexec.patch +%endif +Patch2: redland-db6.diff BuildRequires: autoconf BuildRequires: db-devel BuildRequires: librasqal-devel @@ -33,10 +40,6 @@ BuildRequires: postgresql-devel BuildRequires: sqlite-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1210 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: redland-ocloexec.patch -%endif %description Redland is a library that provides a high-level interface for RDF @@ -49,17 +52,20 @@ %package -n libredland-devel Summary: Development package for programs that use Redland Group: Development/Libraries/C and C++ -Requires: libredland0 = %{version} +Requires: %lname = %version %description -n libredland-devel Files needed to develop with the Redland RDF library. -%package -n libredland0 +%package -n %lname Summary: Libraries that provide support for the Resource Description Framework (RDF) Group: System/Libraries %requires_ge librasqal1 +# Added for 13.1 time +Obsoletes: libredland0 < %version-%release +Provides: libredland0 = %version-%release -%description -n libredland0 +%description -n %lname Redland is a library that provides a high-level interface for RDF (Resource Description Framework) implemented in an object-based API. It is modular and supports different RDF parsers, serializers, storage and @@ -82,6 +88,13 @@ %if 0%{?suse_version} >= 1210 %patch1 -p1 %endif +# +# If multiple libdb-X.Y.so are installed, redland's logic in configure.ac picks +# the library by the numbers it knows (and it may not know future versions!), +# but will use any available headers. This can lead to it choosing some random +# libdb-X.Y.so that does not match up with the headers, for linking. +# +%patch -P 2 -p1 %build autoconf @@ -97,7 +110,7 @@ make %{?_smp_mflags} %install -%makeinstall docdir=%{_docdir}/%{name}-devel/ +make install DESTDIR="%buildroot" docdir=%{_docdir}/%{name}-devel/ rm -f %{buildroot}%{_libdir}/librdf*.la rm -f %{buildroot}%{_libdir}/redland/librdf_storage_postgresql.la @@ -108,21 +121,18 @@ unset MALLOC_CHECK_ %endif -%clean -rm -rf %{buildroot} - -%post -n libredland0 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n libredland0 -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n libredland0 +%files -n %lname %defattr(-, root, root) -%{_libdir}/librdf*.so.* +%{_libdir}/librdf.so.* %files -n libredland-devel %defattr(-, root, root) %{_bindir}/redland-config -%{_libdir}/librdf*.so +%{_libdir}/librdf.so %{_libdir}/pkgconfig/redland.pc %dir %{_libdir}/redland %{_libdir}/redland/librdf_storage_sqlite.la ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.dBwGq0/_old 2013-06-18 15:33:06.000000000 +0200 +++ /var/tmp/diff_new_pack.dBwGq0/_new 2013-06-18 15:33:06.000000000 +0200 @@ -1 +1,3 @@ -libredland0 +librdf0 + obsoletes "libredland0 < <version>" + provides "libredland0 = <version>" ++++++ redland-db6.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2013-06-16 00:39:52.626194128 +0200 Make redland be able to find BDB 6.0. --- configure.ac | 2 +- src/rdf_digest_md5.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) Index: redland-1.0.16/configure.ac =================================================================== --- redland-1.0.16.orig/configure.ac +++ redland-1.0.16/configure.ac @@ -324,7 +324,7 @@ if test "x$bdb_prefix" != "xno" ; then fi # Sigh! And this still might not be good enough. - for bdbc_version in 5.3 5.2 5.1 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do + for bdbc_version in 6.0 5.3 5.2 5.1 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do bdbc_major=`echo $bdbc_version | sed -e 's/^\(.\).*$/\1/'`; bdbc_version2=`echo $bdbc_version | sed -e 's/^\(.\).\(.\)$/\1\2/'` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
