diff --git a/1.1.0.tar.gz b/1.1.0.tar.gz new file mode 100644 index 0000000..aa21a00 --- /dev/null +++ b/1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac104ecad5ca23193152171d8dec2e1bc7cb603a2811b9aa26baa2ab9260f7dd +size 240153 diff --git a/_service b/_service deleted file mode 100644 index 6ad2276..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - https://git.osmocom.org/libosmo-netif - 1.0.0 - 1.0.0 - - - *.tar - xz - - - diff --git a/libosmo-netif-1.0.0.tar.xz b/libosmo-netif-1.0.0.tar.xz deleted file mode 100644 index 2651961..0000000 --- a/libosmo-netif-1.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cf67fb61fc7ce1721f2b7e93f710a8046cda62a6ebfa1aef38e67f9eca39db1 -size 162736 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 55518fc..a25b5f2 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 14 20:55:09 UTC 2021 - Jan Engelhardt + +- Update to release 1.1.0 + * No changelog was provided + ------------------------------------------------------------------- Sun Sep 6 12:19:43 UTC 2020 - Jan Engelhardt diff --git a/libosmo-netif.spec b/libosmo-netif.spec index fc53d0a..2dec106 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,22 @@ # -%define version_unconverted 1.0.0 - Name: libosmo-netif +Version: 1.1.0 +Release: 0 Summary: Osmocom library for muxed audio License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities -Version: 1.0.0 -Release: 0 URL: https://osmocom.org/projects/libosmo-netif -Source: %name-%version.tar.xz +Source: https://github.com/osmocom/libosmo-netif/archive/%version.tar.gz Patch1: osmo-talloc.diff BuildRequires: automake BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 -BuildRequires: xz -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.3.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.3.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 BuildRequires: pkgconfig(talloc) %description diff --git a/osmo-talloc.diff b/osmo-talloc.diff index c186d46..60403a7 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -4,11 +4,11 @@ src/Makefile.am | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) -Index: libosmo-netif-1.0.0/configure.ac +Index: libosmo-netif-1.1.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"] +--- libosmo-netif-1.1.0.orig/configure.ac ++++ libosmo-netif-1.1.0/configure.ac +@@ -124,6 +124,7 @@ AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"] LIBS=$old_LIBS ]) @@ -16,10 +16,10 @@ Index: libosmo-netif-1.0.0/configure.ac found_pcap=yes 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 +Index: libosmo-netif-1.1.0/examples/Makefile.am =================================================================== ---- libosmo-netif-1.0.0.orig/examples/Makefile.am -+++ libosmo-netif-1.0.0/examples/Makefile.am +--- libosmo-netif-1.1.0.orig/examples/Makefile.am ++++ libosmo-netif-1.1.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) @@ -27,7 +27,7 @@ Index: libosmo-netif-1.0.0/examples/Makefile.am AM_LDFLAGS = $(COVERAGE_LDFLAGS) noinst_PROGRAMS = ipa-stream-client \ -@@ -21,54 +21,54 @@ noinst_HEADERS = udp-test.h +@@ -19,57 +19,57 @@ noinst_HEADERS = udp-test.h ipa_stream_client_SOURCES = ipa-stream-client.c ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ @@ -39,6 +39,8 @@ Index: libosmo-netif-1.0.0/examples/Makefile.am - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + if ENABLE_LAPD + noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ @@ -50,6 +52,7 @@ Index: libosmo-netif-1.0.0/examples/Makefile.am $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) + $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS) + endif stream_client_SOURCES = stream-client.c stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ @@ -96,16 +99,16 @@ Index: libosmo-netif-1.0.0/examples/Makefile.am osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -Index: libosmo-netif-1.0.0/src/Makefile.am +Index: libosmo-netif-1.1.0/src/Makefile.am =================================================================== ---- libosmo-netif-1.0.0.orig/src/Makefile.am -+++ libosmo-netif-1.0.0/src/Makefile.am +--- libosmo-netif-1.1.0.orig/src/Makefile.am ++++ libosmo-netif-1.1.0/src/Makefile.am @@ -3,7 +3,7 @@ - LIBVERSION=9:0:1 + LIBVERSION=9:1:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_LIBS) ++AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) lib_LTLIBRARIES = libosmonetif.la