From aa444e2940c66cd5df32d45310a8ff983c6debf8452665f19ac4216097e35235 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 6 Sep 2020 12:23:20 +0000 Subject: [PATCH] - Update to release 1.0.0 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=32 --- _service | 6 +++--- libosmo-netif-0.7.0.tar.xz | 3 --- libosmo-netif-1.0.0.tar.xz | 3 +++ libosmo-netif.changes | 6 ++++++ libosmo-netif.spec | 28 +++++++++++++------------- osmo-talloc.diff | 40 ++++++++++++++++++++++---------------- 6 files changed, 48 insertions(+), 38 deletions(-) delete mode 100644 libosmo-netif-0.7.0.tar.xz create mode 100644 libosmo-netif-1.0.0.tar.xz diff --git a/_service b/_service index 140bdd0..6ad2276 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ git - git://git.osmocom.org/libosmo-netif - 0.7.0 - 0.7.0 + https://git.osmocom.org/libosmo-netif + 1.0.0 + 1.0.0 *.tar diff --git a/libosmo-netif-0.7.0.tar.xz b/libosmo-netif-0.7.0.tar.xz deleted file mode 100644 index 1733473..0000000 --- a/libosmo-netif-0.7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b30bdf598e0f21d6fc469c7aae4ae127d013ecf73f2a56b37e03284500c8dfe -size 161256 diff --git a/libosmo-netif-1.0.0.tar.xz b/libosmo-netif-1.0.0.tar.xz new file mode 100644 index 0000000..2651961 --- /dev/null +++ b/libosmo-netif-1.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cf67fb61fc7ce1721f2b7e93f710a8046cda62a6ebfa1aef38e67f9eca39db1 +size 162736 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 8628ed7..55518fc 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 6 12:19:43 UTC 2020 - Jan Engelhardt + +- Update to release 1.0.0 + * stream: Add new WAIT_RECONNECT cli state + ------------------------------------------------------------------- Sun Jan 5 10:49:20 UTC 2020 - Martin Hauke diff --git a/libosmo-netif.spec b/libosmo-netif.spec index d05466b..fc53d0a 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,18 @@ # -%define version_unconverted 0.7.0 +%define version_unconverted 1.0.0 Name: libosmo-netif Summary: Osmocom library for muxed audio License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities -Version: 0.7.0 +Version: 1.0.0 Release: 0 -Url: https://osmocom.org/projects/libosmo-netif +URL: https://osmocom.org/projects/libosmo-netif Source: %name-%version.tar.xz Patch1: osmo-talloc.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel @@ -63,21 +62,22 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmo-netif. %prep -%setup -q -%patch -P 1 -p1 +%autosetup -p1 %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static --includedir="%_includedir/%name" -make %{?_smp_mflags} +# bugzilla.opensuse.org/795968 for rationale +%configure --includedir="%_includedir/%name" \ + --enable-shared --disable-static +%make_build %install %make_install find "%buildroot/%_libdir" -type f -name "*.la" -delete %check -if ! make %{?_smp_mflags} check; then +if ! %make_build check; then rv=$? cat tests/testsuite.log echo "Suppressing exit $rv" @@ -88,14 +88,12 @@ fi %postun -n libosmonetif8 -p /sbin/ldconfig %files -n libosmonetif8 -%defattr(-,root,root) %_libdir/libosmonetif.so.8* %files -n libosmonetif-devel -%defattr(-,root,root) -%doc COPYING -%dir %_includedir/%name -%dir %_includedir/%name/osmocom +%license COPYING +%dir %_includedir/%name/ +%dir %_includedir/%name/osmocom/ %_includedir/%name/osmocom/netif/ %_libdir/libosmonetif.so %_libdir/pkgconfig/libosmo-netif.pc diff --git a/osmo-talloc.diff b/osmo-talloc.diff index b228b6a..c186d46 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -1,19 +1,25 @@ -diff --git a/configure.ac b/configure.ac -index 7af10ec..619f4ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [ - AC_MSG_ERROR([sctp_send not found in searched libs])]) - LIBS=$old_LIBS +--- + configure.ac | 1 + + examples/Makefile.am | 30 +++++++++++++++--------------- + src/Makefile.am | 2 +- + 3 files changed, 17 insertions(+), 16 deletions(-) + +Index: libosmo-netif-1.0.0/configure.ac +=================================================================== +--- libosmo-netif-1.0.0.orig/configure.ac ++++ libosmo-netif-1.0.0/configure.ac +@@ -111,6 +111,7 @@ AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"] + LIBS=$old_LIBS + ]) +PKG_CHECK_MODULES([TALLOC], [talloc]) - AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) - found_pcap=yes -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 4125243..8780fba 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am + AC_CHECK_HEADERS(pcap.h,,found_pcap=no) + AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) +Index: libosmo-netif-1.0.0/examples/Makefile.am +=================================================================== +--- libosmo-netif-1.0.0.orig/examples/Makefile.am ++++ libosmo-netif-1.0.0/examples/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) @@ -90,10 +96,10 @@ index 4125243..8780fba 100644 osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 64fd1d4..3da783f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am +Index: libosmo-netif-1.0.0/src/Makefile.am +=================================================================== +--- libosmo-netif-1.0.0.orig/src/Makefile.am ++++ libosmo-netif-1.0.0/src/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=9:0:1