[packages/libosip2] - updated to 5.0.0 (note: new sonames) - updated link patch

qboosh qboosh at pld-linux.org
Wed Oct 26 19:55:48 CEST 2016


commit 789afda77c0bb8568555a289df8188504ff27d25
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 26 19:58:07 2016 +0200

    - updated to 5.0.0 (note: new sonames)
    - updated link patch

 libosip2-link.patch | 12 ++++++------
 libosip2.spec       | 21 +++++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/libosip2.spec b/libosip2.spec
index 3bd3612..0c04203 100644
--- a/libosip2.spec
+++ b/libosip2.spec
@@ -5,18 +5,18 @@
 Summary:	The GNU oSIP library
 Summary(pl.UTF-8):	Biblioteka GNU oSIP
 Name:		libosip2
-Version:	4.1.0
+Version:	5.0.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-# Source0-md5:	756423628683c07f817432f046a26516
+# Source0-md5:	5cb1aebecec58946fceb6c136a30d5e1
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-link.patch
 URL:		http://www.gnu.org/software/osip/
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
-BuildRequires:	libtool >= 1:1.4.3
+BuildRequires:	libtool >= 2:2
 Provides:	libosip
 Obsoletes:	libosip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,6 +69,7 @@ Statyczna wersja biblioteki GNU oSIP.
 %{__libtoolize}
 %{__aclocal} -I scripts
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--enable-semaphore \
@@ -84,8 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_mandir}/man{1,3}
-mv -f $RPM_BUILD_ROOT%{_mandir}/man3/osip.{1,3}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libosip*.la
+
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man{1,3}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man3/osip.{1,3}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,16 +100,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog FEATURES HISTORY NEWS README TODO
 %attr(755,root,root) %{_libdir}/libosip2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosip2.so.11
+%attr(755,root,root) %ghost %{_libdir}/libosip2.so.12
 %attr(755,root,root) %{_libdir}/libosipparser2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosipparser2.so.11
+%attr(755,root,root) %ghost %{_libdir}/libosipparser2.so.12
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libosip2.so
 %attr(755,root,root) %{_libdir}/libosipparser2.so
-%{_libdir}/libosip2.la
-%{_libdir}/libosipparser2.la
 %{_includedir}/osip2
 %{_includedir}/osipparser2
 %{_pkgconfigdir}/libosip2.pc
diff --git a/libosip2-link.patch b/libosip2-link.patch
index df23e11..548e0c6 100644
--- a/libosip2-link.patch
+++ b/libosip2-link.patch
@@ -1,10 +1,10 @@
---- libosip2-3.6.0/src/osip2/Makefile.am.orig	2010-01-06 15:58:16.000000000 +0100
-+++ libosip2-3.6.0/src/osip2/Makefile.am	2011-10-15 21:47:56.057797977 +0200
-@@ -13,6 +13,7 @@
- libosip2_la_SOURCES+=port_sema.c port_thread.c port_condv.c
+--- libosip2-5.0.0/src/osip2/Makefile.am.orig	2016-10-26 18:57:15.873862845 +0200
++++ libosip2-5.0.0/src/osip2/Makefile.am	2016-10-26 18:57:58.490529021 +0200
+@@ -14,6 +14,7 @@
  endif
  
+ libosip2_la_LDFLAGS = -version-info $(LIBOSIP_SO_VERSION) ../osipparser2/libosipparser2.la $(FSM_LIB) $(EXTRA_LIB) -no-undefined
 +libosip2_la_LIBADD = -lpthread
- libosip2_la_LDFLAGS = -version-info $(LIBOSIP_SO_VERSION) \
-  $(FSM_LIB) $(EXTRA_LIB) ../osipparser2/libosipparser2.la -no-undefined
  
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libosip2.git/commitdiff/789afda77c0bb8568555a289df8188504ff27d25



More information about the pld-cvs-commit mailing list