[packages/meanwhile] - added pc patch to include -lm in Libs.private, drop .la file; release 6

qboosh qboosh at pld-linux.org
Sat Feb 27 15:32:20 CET 2021


commit 50f92a3361d44c8c8cb5d051bd6ef701ca75190e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 27 15:33:07 2021 +0100

    - added pc patch to include -lm in Libs.private, drop .la file; release 6

 meanwhile-pc.patch | 10 ++++++++++
 meanwhile.spec     | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/meanwhile.spec b/meanwhile.spec
index 38c6f38..f0b83ca 100644
--- a/meanwhile.spec
+++ b/meanwhile.spec
@@ -1,19 +1,20 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
+%bcond_without	static_libs	# static library
 #
 Summary:	Lotus Sametime library
 Summary(pl.UTF-8):	Biblioteka Lotus Sametime
 Name:		meanwhile
 Version:	1.0.2
-Release:	5
+Release:	6
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/meanwhile/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/meanwhile/%{name}-%{version}.tar.gz
 # Source0-md5:	bf4ced109a367b4c5d71fe63c043270e
 Patch0:		%{name}-glib-includes.patch
 Patch1:		%{name}-static-build.patch
 Patch2:		format-security.patch
+Patch3:		%{name}-pc.patch
 URL:		http://meanwhile.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -73,6 +74,7 @@ Statyczna biblioteka meanwhile.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmeanwhile.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,7 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-doc-%{version}
 %attr(755,root,root) %{_libdir}/libmeanwhile.so
-%{_libdir}/libmeanwhile.la
 %{_includedir}/meanwhile
 %{_pkgconfigdir}/meanwhile.pc
 
diff --git a/meanwhile-pc.patch b/meanwhile-pc.patch
new file mode 100644
index 0000000..a602dac
--- /dev/null
+++ b/meanwhile-pc.patch
@@ -0,0 +1,10 @@
+--- meanwhile-1.0.2/meanwhile.pc.in.orig	2005-09-22 01:23:04.000000000 +0200
++++ meanwhile-1.0.2/meanwhile.pc.in	2021-02-27 15:30:00.730487596 +0100
+@@ -10,6 +10,7 @@
+ Requires: glib-2.0 >= @GLIB_VERSION@
+ 
+ Libs: -L${libdir} -lmeanwhile
++Libs.private: @LIBM@
+ Cflags: -I${includedir}/meanwhile
+ 
+ libarchive=${libdir}/libmeanwhile.a
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meanwhile.git/commitdiff/50f92a3361d44c8c8cb5d051bd6ef701ca75190e



More information about the pld-cvs-commit mailing list