update to 0.7.0.6 to get sigtran
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=6
This commit is contained in:
parent
f93aeb4542
commit
93277e32f7
@ -1,4 +1,4 @@
|
||||
From 155761a550f09a074f960deb2e65dc8724465714 Mon Sep 17 00:00:00 2001
|
||||
From f34a36b94185f377639c7c997dcdd2453fc23574 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 21 Jul 2014 10:13:00 +0200
|
||||
Subject: [PATCH] build: fixes
|
||||
@ -8,26 +8,26 @@ Find and use system talloc, do not rely on OSMO's bundled copy.
|
||||
Rename libmtp to libosmo-mtp, as libmtp is already used by the
|
||||
Multimedia Transfer Protocol library.
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
configure.ac | 3 ++-
|
||||
libosmo-mtp.pc.in | 2 +-
|
||||
libosmo-sccp.pc.in | 2 +-
|
||||
src/Makefile.am | 12 ++++++++----
|
||||
src/Makefile.am | 14 +++++++++-----
|
||||
tests/m2ua/Makefile.am | 2 +-
|
||||
tests/sccp/Makefile.am | 4 ++--
|
||||
6 files changed, 16 insertions(+), 10 deletions(-)
|
||||
6 files changed, 16 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 49c5f7e..2f9d29a 100644
|
||||
index 702941a..fe596d2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -13,9 +13,11 @@ dnl checks for programs
|
||||
AC_PROG_MAKE_SET
|
||||
@@ -14,10 +14,11 @@ AC_PROG_MAKE_SET
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
-AC_PROG_RANLIB
|
||||
+LT_INIT
|
||||
LT_INIT
|
||||
-AC_PROG_LIBTOOL
|
||||
|
||||
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
|
||||
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6.1)
|
||||
+PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm])
|
||||
+PKG_CHECK_MODULES([TALLOC], [talloc])
|
||||
|
||||
@ -56,26 +56,34 @@ index eda8d49..9dd18c1 100644
|
||||
+Libs: -L${libdir} -losmo-sccp
|
||||
Cflags: -I${includedir}/
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index fa47e85..815fb8c 100644
|
||||
index ba55162..f48deb7 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -2,8 +2,12 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
|
||||
@@ -4,15 +4,19 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
|
||||
# Legacy static libs
|
||||
|
||||
sccpdir = $(libdir)
|
||||
-sccp_LIBRARIES = libsccp.a libmtp.a libxua.a
|
||||
+sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-xua.la
|
||||
|
||||
-libsccp_a_SOURCES = sccp.c
|
||||
-libmtp_a_SOURCES = mtp_pcap.c
|
||||
-libmtp_a_SOURCES = mtp_pcap.c
|
||||
-libxua_a_SOURCES = xua_msg.c
|
||||
+libosmo_sccp_la_SOURCES = sccp.c
|
||||
+libosmo_mtp_la_SOURCES = mtp_pcap.c
|
||||
+libosmo_mtp_la_SOURCES = mtp_pcap.c
|
||||
+libosmo_xua_la_SOURCES = xua_msg.c
|
||||
# ensure that the file for the static lib is built with different C
|
||||
# flags, working around automake complaining that xua_msg.o is built
|
||||
# both with libtool (below) and without (here)
|
||||
-libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY
|
||||
+libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY
|
||||
+
|
||||
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
||||
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
||||
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
|
||||
|
||||
|
||||
# New shared lib
|
||||
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am
|
||||
index 33618ef..a04145f 100644
|
||||
--- a/tests/m2ua/Makefile.am
|
||||
|
3
libosmo-sccp-0.7.0.6.tar.xz
Normal file
3
libosmo-sccp-0.7.0.6.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bb213700bf2defa9075bd48eee01473dd339a22fab2212afc0499308d63fdd0b
|
||||
size 45624
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a1923984890b26f50e624101112c7a6bbfdeb11ae43f40a4a7400961df64a5f
|
||||
size 36260
|
@ -17,25 +17,28 @@
|
||||
|
||||
|
||||
Name: libosmo-sccp
|
||||
Version: 0.7.0.6
|
||||
Release: 0
|
||||
Summary: Osmocom library for the A-bis interface between BTS and BSC
|
||||
License: AGPL-3.0+ and GPL-2.0+
|
||||
Group: Development/Libraries/C and C++
|
||||
Version: 0.7.0
|
||||
Release: 0
|
||||
Group: Hardware/Mobile
|
||||
Url: http://openbsc.osmocom.org/
|
||||
|
||||
#Git-Clone: git://git.osmocom.org/libosmo-sccp
|
||||
#Snapshot: 0.7.0
|
||||
#Snapshot: 0.7.0-6-g8209bc8
|
||||
Source: %name-%version.tar.xz
|
||||
Patch1: 0001-build-fixes.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake >= 1.6
|
||||
BuildRequires: libtool
|
||||
BuildRequires: lksctp-tools-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(libosmocore) >= 0.3.0
|
||||
BuildRequires: pkgconfig(libosmo-netif) >= 0.0.6.1
|
||||
BuildRequires: pkgconfig(libosmocore) >= 0.9.0.45
|
||||
BuildRequires: pkgconfig(libosmogsm)
|
||||
BuildRequires: pkgconfig(libosmovty)
|
||||
BuildRequires: pkgconfig(talloc)
|
||||
|
||||
%description
|
||||
@ -55,6 +58,7 @@ across an IP network.
|
||||
Summary: Development files for the Osmocom M2UA library
|
||||
License: AGPL-3.0+
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libosmo-sigtran-devel = %version
|
||||
Requires: libosmo-xua-0_7_0 = %version
|
||||
|
||||
%description -n libosmo-xua-devel
|
||||
@ -114,6 +118,21 @@ in SS7 telecommunications networks.
|
||||
This subpackage contains the development files for the Osmocom SCCP
|
||||
library.
|
||||
|
||||
%package -n libosmo-sigtran0
|
||||
Summary: Osmocom SIGTRAN library
|
||||
License: GPL-2.0+
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libosmo-sigtran0
|
||||
Osmocom implementation of (parts of) SIGTRAN.
|
||||
|
||||
%package -n libosmo-sigtran-devel
|
||||
Summary: Development files for the Osmocom sigtran library
|
||||
License: AGPL-3.0+
|
||||
Group: Development/Libraries/C and C++
|
||||
|
||||
%description -n libosmo-sigtran-devel
|
||||
|
||||
%prep
|
||||
%setup -qn %name
|
||||
%patch -P 1 -p1
|
||||
@ -145,8 +164,6 @@ make %{?_smp_mflags} check
|
||||
|
||||
%files -n libosmo-xua-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %_includedir/osmocom
|
||||
%_includedir/osmocom/sigtran/
|
||||
%_libdir/libosmo-xua.so
|
||||
|
||||
%files -n libosmo-mtp-0_7_0
|
||||
@ -171,4 +188,15 @@ make %{?_smp_mflags} check
|
||||
%_includedir/osmocom/sccp/
|
||||
%_libdir/pkgconfig/libosmo-sccp.pc
|
||||
|
||||
%files -n libosmo-sigtran0
|
||||
%defattr(-,root,root)
|
||||
%_libdir/libosmo-sigtran.so.0*
|
||||
|
||||
%files -n libosmo-sigtran-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %_includedir/osmocom
|
||||
%_includedir/osmocom/sigtran/
|
||||
%_libdir/libosmo-sigtran.so
|
||||
%_libdir/pkgconfig/libosmo-sigtran.pc
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user