[packages/redland] - added LDFLAGS patch (drop our rpmldflags from pkgconfig libs) - drop .la file - release 5

[qboosh]

commit 6a85d58a672a4cbfebf6b46009abefd90057c30f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Nov 24 06:34:42 2020 +0100

    - added LDFLAGS patch (drop our rpmldflags from pkgconfig libs)
    - drop .la file
    - release 5

 redland-LDFLAGS.patch | 20 ++++++++++++++++++++
 redland.spec          | 10 +++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/redland.spec b/redland.spec
index e06bd13..b0a874b 100644
--- a/redland.spec
+++ b/redland.spec
@@ -8,11 +8,12 @@ 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.17
-Release:	4
+Release:	5
 License:	LGPL v2.1+ or GPL v2+ or Apache v2.0
 Group:		Libraries
 Source0:	http://download.librdf.org/source/%{name}-%{version}.tar.gz
 # Source0-md5:	e5be03eda13ef68aabab6e42aa67715e
+Patch0:		%{name}-LDFLAGS.patch
 URL:		http://librdf.org/
 %if %{with threestore}
 BuildRequires:	3store-devel >= 2.0
@@ -152,6 +153,7 @@ RDF.
 
 %prep
 %setup -q
+%patch0 -p1
 
 sed -i 's,bdbc_prefix/lib$,bdbc_prefix/%{_lib},' configure.ac
 
@@ -180,7 +182,7 @@ cd ..
 	--with-raptor=system \
 	--with-rasqal=system \
 	--with-threads \
-	--with%{!?with_threestore:out}-threestore
+	--with-threestore%{!?with_threestore:=no}
 
 %{__make}
 
@@ -190,7 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# dlopened modules
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/redland/*.{la,a}
+# obsoleted by redland.pc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librdf.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -216,7 +221,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/{README.html,storage.html}
 %attr(755,root,root) %{_bindir}/redland-config
 %attr(755,root,root) %{_libdir}/librdf.so
-%{_libdir}/librdf.la
 %{_includedir}/librdf.h
 %{_includedir}/rdf_*.h
 %{_includedir}/redland.h
diff --git a/redland-LDFLAGS.patch b/redland-LDFLAGS.patch
new file mode 100644
index 0000000..f3f59f5
--- /dev/null
+++ b/redland-LDFLAGS.patch
@@ -0,0 +1,20 @@
+--- redland-1.0.17/configure.ac.orig	2020-11-23 22:18:01.581515208 +0100
++++ redland-1.0.17/configure.ac	2020-11-23 22:23:29.336406274 +0100
+@@ -378,7 +378,7 @@
+   AC_MSG_RESULT($bdb_include_dir)
+ 
+   if test "$bdb_prefix" != no; then
+-    nLDFLAGS=$LDFLAGS
++    nLDFLAGS=
+     nCPPFLAGS=
+ 
+     if test "$bdb_lib_dir" != /usr/lib; then
+--- redland-1.0.17/redland.pc.in.orig	2011-01-21 16:56:38.000000000 +0100
++++ redland-1.0.17/redland.pc.in	2020-11-24 06:28:44.982006620 +0100
+@@ -14,5 +14,5 @@
+ Requires.private: raptor2 >= @RAPTOR_MIN_VERSION@, rasqal >= @RASQAL_MIN_VERSION@, rasqal <= @RASQAL_MAX_VERSION@
+ Version: @VERSION@
+ Libs: -L${libdir} -lrdf
+-Libs.private: @LIBRDF_LDFLAGS@ @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
++Libs.private: @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
+ Cflags: -I${includedir}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/redland.git/commitdiff/6a85d58a672a4cbfebf6b46009abefd90057c30f