pool/libosmo-sccp
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libosmo-sccp-0.7.0.11

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=8
This commit is contained in:
Jan Engelhardt 2016-01-22 18:34:34 +00:00 committed by Git OBS Bridge
parent f2c4ca9c99
commit fa8189eda7
5 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
0001-build-fixes.patch
View File

@ -8,35 +8,33 @@ 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 Rename libmtp to libosmo-mtp, as libmtp is already used by the
Multimedia Transfer Protocol library. Multimedia Transfer Protocol library.
--- ---
configure.ac | 3 ++- configure.ac | 3 ++-
libosmo-mtp.pc.in | 2 +- libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +-
src/Makefile.am | 14 +++++++++----- src/Makefile.am | 14 +++++++++-----
tests/m2ua/Makefile.am | 2 +- tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++-- tests/sccp/Makefile.am | 4 ++--
6 files changed, 16 insertions(+), 11 deletions(-) 6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac Index: libosmo-sccp/configure.ac
index 702941a..fe596d2 100644 ===================================================================
--- a/configure.ac --- libosmo-sccp.orig/configure.ac
+++ b/configure.ac +++ libosmo-sccp/configure.ac
@@ -14,10 +14,11 @@ AC_PROG_MAKE_SET @@ -14,8 +14,9 @@ AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
LT_INIT LT_INIT
-AC_PROG_LIBTOOL -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([LIBOSMOGSM], [libosmogsm])
+PKG_CHECK_MODULES([TALLOC], [talloc]) +PKG_CHECK_MODULES([TALLOC], [talloc])
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.6)
# The following test is taken from WebKit's webkit.m4 Index: libosmo-sccp/libosmo-mtp.pc.in
saved_CFLAGS="$CFLAGS" ===================================================================
diff --git a/libosmo-mtp.pc.in b/libosmo-mtp.pc.in --- libosmo-sccp.orig/libosmo-mtp.pc.in
index 675d0d3..5e99dd3 100644 +++ libosmo-sccp/libosmo-mtp.pc.in
--- a/libosmo-mtp.pc.in
+++ b/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@ @@ -6,5 +6,5 @@ includedir=@includedir@
Name: Osmo MTP Lib Name: Osmo MTP Lib
Description: Osmo MTP Lib Description: Osmo MTP Lib
@ -44,10 +42,10 @@ index 675d0d3..5e99dd3 100644
-Libs: -L${libdir} -lmtp -Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp +Libs: -L${libdir} -losmo-mtp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
diff --git a/libosmo-sccp.pc.in b/libosmo-sccp.pc.in Index: libosmo-sccp/libosmo-sccp.pc.in
index eda8d49..9dd18c1 100644 ===================================================================
--- a/libosmo-sccp.pc.in --- libosmo-sccp.orig/libosmo-sccp.pc.in
+++ b/libosmo-sccp.pc.in +++ libosmo-sccp/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@ @@ -6,5 +6,5 @@ includedir=@includedir@
Name: OpenBSC SCCP Lib Name: OpenBSC SCCP Lib
Description: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib
@ -55,11 +53,11 @@ index eda8d49..9dd18c1 100644
-Libs: -L${libdir} -lsccp -Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp +Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/ Cflags: -I${includedir}/
diff --git a/src/Makefile.am b/src/Makefile.am Index: libosmo-sccp/src/Makefile.am
index ba55162..f48deb7 100644 ===================================================================
--- a/src/Makefile.am --- libosmo-sccp.orig/src/Makefile.am
+++ b/src/Makefile.am +++ libosmo-sccp/src/Makefile.am
@@ -4,15 +4,19 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) @@ -4,15 +4,19 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(
# Legacy static libs # Legacy static libs
sccpdir = $(libdir) sccpdir = $(libdir)
@ -84,20 +82,20 @@ index ba55162..f48deb7 100644
# New shared lib # New shared lib
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am Index: libosmo-sccp/tests/m2ua/Makefile.am
index 33618ef..a04145f 100644 ===================================================================
--- a/tests/m2ua/Makefile.am --- libosmo-sccp.orig/tests/m2ua/Makefile.am
+++ b/tests/m2ua/Makefile.am +++ libosmo-sccp/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok @@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
noinst_PROGRAMS = m2ua_test noinst_PROGRAMS = m2ua_test
m2ua_test_SOURCES = m2ua_test.c m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS) -m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} +m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am Index: libosmo-sccp/tests/sccp/Makefile.am
index 8cce20c..50624ce 100644 ===================================================================
--- a/tests/sccp/Makefile.am --- libosmo-sccp.orig/tests/sccp/Makefile.am
+++ b/tests/sccp/Makefile.am +++ libosmo-sccp/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS} +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
@ -111,6 +109,3 @@ index 8cce20c..50624ce 100644
-sccp_test_LDADD = $(LIBOSMOCORE_LIBS) -sccp_test_LDADD = $(LIBOSMOCORE_LIBS)
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
--
2.4.3

3
libosmo-sccp-0.7.0.11.tar.xz Normal file
View File

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

3
libosmo-sccp-0.7.0.6.tar.xz
View File

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

8
libosmo-sccp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 22 18:33:36 UTC 2016 - jengelh@inai.de
- Update to new upstream snapshot 0.7.0.11
* Add missing OSMO_SCCP_SSN_RANAP for RANAP SSN
* Properly define SCCP_SAP_USER without random magic number
* Import SUA (SCCP User Adaptation) and SCCP User SAP
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 10 21:34:08 UTC 2015 - jengelh@inai.de Thu Sep 10 21:34:08 UTC 2015 - jengelh@inai.de

23
libosmo-sccp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libosmo-sccp # spec file for package libosmo-sccp
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -17,7 +17,7 @@
Name: libosmo-sccp Name: libosmo-sccp
Version: 0.7.0.6 Version: 0.7.0.11
Release: 0 Release: 0
Summary: Osmocom library for the A-bis interface between BTS and BSC Summary: Osmocom library for the A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
@ -25,7 +25,7 @@ Group: Hardware/Mobile
Url: http://openbsc.osmocom.org/ Url: http://openbsc.osmocom.org/
#Git-Clone: git://git.osmocom.org/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp
#Snapshot: 0.7.0-6-g8209bc8 #Snapshot: 0.7.0-11-gf440267 (--tags)
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: 0001-build-fixes.patch Patch1: 0001-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -141,7 +141,7 @@ Requires: libosmo-sigtran0 = %version
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
autoreconf -fiv autoreconf -fiv
%configure --enable-shared --disable-static %configure --enable-shared --disable-static --includedir="%_includedir/%name"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -173,8 +173,9 @@ make %{?_smp_mflags} check
%files -n libosmo-mtp-devel %files -n libosmo-mtp-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/mtp/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/mtp/
%_libdir/libosmo-mtp.so %_libdir/libosmo-mtp.so
%_libdir/pkgconfig/libosmo-mtp.pc %_libdir/pkgconfig/libosmo-mtp.pc
@ -185,8 +186,9 @@ make %{?_smp_mflags} check
%files -n libosmo-sccp-devel %files -n libosmo-sccp-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/sccp/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/sccp/
%_libdir/pkgconfig/libosmo-sccp.pc %_libdir/pkgconfig/libosmo-sccp.pc
%files -n libosmo-sigtran0 %files -n libosmo-sigtran0
@ -195,8 +197,9 @@ make %{?_smp_mflags} check
%files -n libosmo-sigtran-devel %files -n libosmo-sigtran-devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %_includedir/osmocom %dir %_includedir/%name
%_includedir/osmocom/sigtran/ %dir %_includedir/%name/osmocom
%_includedir/%name/osmocom/sigtran/
%_libdir/libosmo-sigtran.so %_libdir/libosmo-sigtran.so
%_libdir/pkgconfig/libosmo-sigtran.pc %_libdir/pkgconfig/libosmo-sigtran.pc