[packages/libtirpc] - updated to 1.3.3 - updated link patch - fixed build without musl
qboosh
qboosh at pld-linux.org
Sun Oct 9 19:50:08 CEST 2022
commit 905e760cac7a0396de9cca1f1f0a8ea53ec8168a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 9 19:50:46 2022 +0200
- updated to 1.3.3
- updated link patch
- fixed build without musl
libtirpc-link.patch | 18 ++++++++----------
libtirpc.spec | 13 +++++++------
2 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/libtirpc.spec b/libtirpc.spec
index 70d02fa..39758df 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -10,13 +10,13 @@
Summary: Transport Independent RPC Library
Summary(pl.UTF-8): Biblioteka RPC niezależnego od transportu
Name: libtirpc
-Version: 1.3.2
-Release: 5
+Version: 1.3.3
+Release: 1
Epoch: 1
License: BSD
Group: Libraries
Source0: https://downloads.sourceforge.net/libtirpc/%{name}-%{version}.tar.bz2
-# Source0-md5: cf4ca51f3fc401bea61c702c69171ab0
+# Source0-md5: bacdad5c27dcf6e2830b3e26a1c8ed3f
Patch0: %{name}-link.patch
URL: http://sourceforge.net/projects/libtirpc/
BuildRequires: autoconf >= 2.50
@@ -143,9 +143,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/%{_lib},%{_mandir}/man{3,5}}
DESTDIR=$(pwd)/musl/destdir
install -d $RPM_BUILD_ROOT{%{_includedir}/musl,%{_libdir}/musl}
-mv musl/destdir/%{_includedir}/tirpc $RPM_BUILD_ROOT%{_includedir}/musl
-mv musl/destdir/%{_libdir}/libtirpc.a $RPM_BUILD_ROOT%{_libdir}/musl
-
+%{__mv} musl/destdir%{_includedir}/tirpc $RPM_BUILD_ROOT%{_includedir}/musl
+%{__mv} musl/destdir%{_libdir}/libtirpc.a $RPM_BUILD_ROOT%{_libdir}/musl
%endif
%{__make} -C build/doc install \
@@ -190,7 +189,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libtirpc.a
+%if %{with musl}
%files musl-devel
%defattr(644,root,root,755)
%{_includedir}/musl/tirpc
%{_libdir}/musl/libtirpc.a
+%endif
diff --git a/libtirpc-link.patch b/libtirpc-link.patch
index 802f228..b434eda 100644
--- a/libtirpc-link.patch
+++ b/libtirpc-link.patch
@@ -1,24 +1,22 @@
-diff -urNp -x '*.orig' libtirpc-1.3.1.org/libtirpc.pc.in libtirpc-1.3.1/libtirpc.pc.in
---- libtirpc-1.3.1.org/libtirpc.pc.in 2020-12-01 16:06:57.000000000 +0100
-+++ libtirpc-1.3.1/libtirpc.pc.in 2021-03-21 21:46:55.788370390 +0100
+--- libtirpc-1.3.3/libtirpc.pc.in.orig 2022-10-09 19:40:46.531577016 +0200
++++ libtirpc-1.3.3/libtirpc.pc.in 2022-10-09 19:41:14.921423215 +0200
@@ -8,5 +8,5 @@ Description: Transport Independent RPC L
Requires:
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ltirpc
--Libs.private: -lpthread
-+Libs.private: -lpthread @GSSAPI_LIBS@
+-Libs.private: @PTHREAD_LIBS@
++Libs.private: @PTHREAD_LIBS@ @GSSAPI_LIBS@
Cflags: -I${includedir}/tirpc
-diff -urNp -x '*.orig' libtirpc-1.3.1.org/src/Makefile.am libtirpc-1.3.1/src/Makefile.am
---- libtirpc-1.3.1.org/src/Makefile.am 2020-12-01 16:06:57.000000000 +0100
-+++ libtirpc-1.3.1/src/Makefile.am 2021-03-21 21:46:55.788370390 +0100
+--- libtirpc-1.3.3/src/Makefile.am.orig 2022-08-02 20:55:33.000000000 +0200
++++ libtirpc-1.3.3/src/Makefile.am 2022-10-09 19:42:23.234386465 +0200
@@ -12,8 +12,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/tirpc -inc
lib_LTLIBRARIES = libtirpc.la
--libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined -lpthread
+-libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined @PTHREAD_LIBS@
+libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined
libtirpc_la_LDFLAGS += -version-info @LT_VERSION_INFO@
-+libtirpc_la_LIBADD = -lpthread
++libtirpc_la_LIBADD = @PTHREAD_LIBS@
libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
binddynport.c bindresvport.c \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libtirpc.git/commitdiff/905e760cac7a0396de9cca1f1f0a8ea53ec8168a
More information about the pld-cvs-commit
mailing list