jengelh/libosmo-netif
SHA256
1
0
Fork 0
forked from pool/libosmo-netif
Code Pull Requests Activity

- Update to release 1.0.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=32
This commit is contained in:
Jan Engelhardt 2020-09-06 12:23:20 +00:00 committed by Git OBS Bridge
parent 8d9efcf92c
commit aa444e2940
6 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -1,9 +1,9 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">git://git.osmocom.org/libosmo-netif</param> <param name="url">https://git.osmocom.org/libosmo-netif</param>
<param name="revision">0.7.0</param> <param name="revision">1.0.0</param>
<param name="versionformat">0.7.0</param> <param name="versionformat">1.0.0</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

3
libosmo-netif-0.7.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b30bdf598e0f21d6fc469c7aae4ae127d013ecf73f2a56b37e03284500c8dfe
size 161256

3
libosmo-netif-1.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cf67fb61fc7ce1721f2b7e93f710a8046cda62a6ebfa1aef38e67f9eca39db1
size 162736

6
libosmo-netif.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 6 12:19:43 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.0.0
* stream: Add new WAIT_RECONNECT cli state
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 5 10:49:20 UTC 2020 - Martin Hauke <mardnh@gmx.de> Sun Jan 5 10:49:20 UTC 2020 - Martin Hauke <mardnh@gmx.de>

28
libosmo-netif.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-netif # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Name: libosmo-netif
Summary: Osmocom library for muxed audio Summary: Osmocom library for muxed audio
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Telephony/Utilities Group: Productivity/Telephony/Utilities
Version: 0.7.0 Version: 1.0.0
Release: 0 Release: 0
Url: https://osmocom.org/projects/libosmo-netif URL: https://osmocom.org/projects/libosmo-netif
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: osmo-talloc.diff Patch1: osmo-talloc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool >= 2 BuildRequires: libtool >= 2
BuildRequires: lksctp-tools-devel 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. applications that want to make use of libosmo-netif.
%prep %prep
%setup -q %autosetup -p1
%patch -P 1 -p1
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
autoreconf -fiv autoreconf -fiv
%configure --enable-shared --disable-static --includedir="%_includedir/%name" # bugzilla.opensuse.org/795968 for rationale
make %{?_smp_mflags} %configure --includedir="%_includedir/%name" \
--enable-shared --disable-static
%make_build
%install %install
%make_install %make_install
find "%buildroot/%_libdir" -type f -name "*.la" -delete find "%buildroot/%_libdir" -type f -name "*.la" -delete
%check %check
if ! make %{?_smp_mflags} check; then if ! %make_build check; then
rv=$? rv=$?
cat tests/testsuite.log cat tests/testsuite.log
echo "Suppressing exit $rv" echo "Suppressing exit $rv"
@ -88,14 +88,12 @@ fi
%postun -n libosmonetif8 -p /sbin/ldconfig %postun -n libosmonetif8 -p /sbin/ldconfig
%files -n libosmonetif8 %files -n libosmonetif8
%defattr(-,root,root)
%_libdir/libosmonetif.so.8* %_libdir/libosmonetif.so.8*
%files -n libosmonetif-devel %files -n libosmonetif-devel
%defattr(-,root,root) %license COPYING
%doc COPYING %dir %_includedir/%name/
%dir %_includedir/%name %dir %_includedir/%name/osmocom/
%dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/netif/ %_includedir/%name/osmocom/netif/
%_libdir/libosmonetif.so %_libdir/libosmonetif.so
%_libdir/pkgconfig/libosmo-netif.pc %_libdir/pkgconfig/libosmo-netif.pc

40
osmo-talloc.diff
View File

@ -1,19 +1,25 @@
diff --git a/configure.ac b/configure.ac ---
index 7af10ec..619f4ad 100644 configure.ac | 1 +
--- a/configure.ac examples/Makefile.am | 30 +++++++++++++++---------------
+++ b/configure.ac src/Makefile.am | 2 +-
@@ -98,6 +98,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [ 3 files changed, 17 insertions(+), 16 deletions(-)
AC_MSG_ERROR([sctp_send not found in searched libs])])
LIBS=$old_LIBS 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]) +PKG_CHECK_MODULES([TALLOC], [talloc])
AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
found_pcap=yes found_pcap=yes
diff --git a/examples/Makefile.am b/examples/Makefile.am AC_CHECK_HEADERS(pcap.h,,found_pcap=no)
index 4125243..8780fba 100644 AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes)
--- a/examples/Makefile.am Index: libosmo-netif-1.0.0/examples/Makefile.am
+++ b/examples/Makefile.am ===================================================================
--- libosmo-netif-1.0.0.orig/examples/Makefile.am
+++ libosmo-netif-1.0.0/examples/Makefile.am
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) -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 \ osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am Index: libosmo-netif-1.0.0/src/Makefile.am
index 64fd1d4..3da783f 100644 ===================================================================
--- a/src/Makefile.am --- libosmo-netif-1.0.0.orig/src/Makefile.am
+++ b/src/Makefile.am +++ libosmo-netif-1.0.0/src/Makefile.am
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
LIBVERSION=9:0:1 LIBVERSION=9:0:1