Accepting request 331849 from network:telephony

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/331849
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosmo-sccp?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2015-09-24 04:14:07 +00:00 committed by Git OBS Bridge
commit 94f693f9ec
5 changed files with 71 additions and 65 deletions

View File

@ -1,4 +1,4 @@
From 1d95c316569c325775981aecd31b34abad029a2f Mon Sep 17 00:00:00 2001
From 155761a550f09a074f960deb2e65dc8724465714 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
@ -12,12 +12,12 @@ Multimedia Transfer Protocol library.
libosmo-mtp.pc.in | 2 +-
libosmo-sccp.pc.in | 2 +-
src/Makefile.am | 12 ++++++++----
tests/m2ua/Makefile.am | 6 +++---
tests/sccp/Makefile.am | 6 +++---
6 files changed, 19 insertions(+), 13 deletions(-)
tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 4 ++--
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 98a6b1f..75d2b95 100644
index 49c5f7e..2f9d29a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,11 @@ dnl checks for programs
@ -56,54 +56,47 @@ index eda8d49..9dd18c1 100644
+Libs: -L${libdir} -losmo-sccp
Cflags: -I${includedir}/
diff --git a/src/Makefile.am b/src/Makefile.am
index c7451ad..85863f8 100644
index fa47e85..815fb8c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,12 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
@@ -2,8 +2,12 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
sccpdir = $(libdir)
-sccp_LIBRARIES = libsccp.a libmtp.a libm2ua.a
+sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-m2ua.la
+
+libosmo_sccp_la_SOURCES = sccp.c
+libosmo_mtp_la_SOURCES = mtp_pcap.c
+libosmo_m2ua_la_SOURCES = m2ua_msg.c
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_m2ua_la_LDFLAGS = -release ${PACKAGE_VERSION}
-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
-libm2ua_a_SOURCES = m2ua_msg.c
-libxua_a_SOURCES = xua_msg.c
+libosmo_sccp_la_SOURCES = sccp.c
+libosmo_mtp_la_SOURCES = mtp_pcap.c
+libosmo_xua_la_SOURCES = xua_msg.c
+
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am
index 0eb8302..1d1b56f 100644
index 33618ef..a04145f 100644
--- a/tests/m2ua/Makefile.am
+++ b/tests/m2ua/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -Wall
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall ${LIBOSMOCORE_CFLAGS} ${TALLOC_CFLAGS}
+AM_CFLAGS=-Wall
EXTRA_DIST = m2ua_test.ok
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
noinst_PROGRAMS = m2ua_test
m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libm2ua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-m2ua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_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 90790a3..f43d858 100644
index 8cce20c..50624ce 100644
--- a/tests/sccp/Makefile.am
+++ b/tests/sccp/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${LIBOSMOCORE_CFLAGS} ${TALLOC_CFLAGS}
+AM_CFLAGS=-Wall -ggdb3
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
EXTRA_DIST = sccp_test.ok
@@ -6,5 +6,5 @@ EXTRA_DIST = sccp_test.ok
noinst_PROGRAMS = sccp_test
sccp_test_SOURCES = sccp_test.c $(top_srcdir)/src/sccp.c
@ -111,5 +104,5 @@ index 90790a3..f43d858 100644
+sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
--
2.0.0
2.4.3

View File

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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Sep 10 21:34:08 UTC 2015 - jengelh@inai.de
- Update to new upstream release 0.7.0
* sccp: Allow to specify the context of the incoming message
* mtp: Correct the pointcode mask
* mtp: Add implementation from cellmgr
* m3ua: Add the definition of the protocol data header
* xua: Generalize the m2ua_msg and call it xua_msg
* XUA: Move m2ua headers to sigtran, create xua_types.h
and m3ua_types.h
* sccp: Create sccp_create_cr and use it in the connection creation
-------------------------------------------------------------------
Mon Jul 21 08:37:45 UTC 2014 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libosmo-sccp
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,12 +20,12 @@ Name: libosmo-sccp
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.0.6.3
Version: 0.7.0
Release: 0
Url: http://openbsc.osmocom.org/
#Git-Clone: git://git.osmocom.org/libosmo-sccp
#Snapshot: 0.0.6.3
#Snapshot: 0.7.0
Source: %name-%version.tar.xz
Patch1: 0001-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,35 +41,35 @@ BuildRequires: pkgconfig(talloc)
%description
Osmocom library for the A-bis interface between BTS and BSC.
%package -n libosmo-m2ua-0_0_6_3
%package -n libosmo-xua-0_7_0
Summary: Osmocom Message Transfer Part 2 User Adaptation library
License: AGPL-3.0+
Group: System/Libraries
%description -n libosmo-m2ua-0_0_6_3
%description -n libosmo-xua-0_7_0
M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the
seamless backhaul of MTP Level 2 user messages and service interface
across an IP network.
%package -n libosmo-m2ua-devel
%package -n libosmo-xua-devel
Summary: Development files for the Osmocom M2UA library
License: AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmo-m2ua-0_0_6_3 = %version
Requires: libosmo-xua-0_7_0 = %version
%description -n libosmo-m2ua-devel
%description -n libosmo-xua-devel
M2UA provides an SCTP adaptation layer for MTP level 2 user messages
and service interface across an IP network.
This subpackage contains the development files for the Osmocom M2UA
library.
%package -n libosmo-mtp-0_0_6_3
%package -n libosmo-mtp-0_7_0
Summary: Osmocom Message Transfer Part library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmo-mtp-0_0_6_3
%description -n libosmo-mtp-0_7_0
The Message Transfer Part (MTP) is part of the Signaling System 7
(SS7) used for communication in Public Switched Telephone Networks.
MTP is responsible for reliable, unduplicated and in-sequence
@ -79,7 +79,7 @@ transport of SS7 messages between communication partners.
Summary: Development files for the Osmocom MTP library
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmo-mtp-0_0_6_3 = %version
Requires: libosmo-mtp-0_7_0 = %version
%description -n libosmo-mtp-devel
MTP is part of SS7 used for communication in Public Switched
@ -88,12 +88,12 @@ Telephone Networks.
This subpackage contains the development files for the Osmocom MTP
library.
%package -n libosmo-sccp-0_0_6_3
%package -n libosmo-sccp-0_7_0
Summary: Osmocom Signalling Connection Control Part library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmo-sccp-0_0_6_3
%description -n libosmo-sccp-0_7_0
The Signalling Connection Control Part (SCCP) is a network layer
protocol that provides extended routing, flow control, segmentation,
connection-orientation, and error correction facilities in Signaling
@ -104,7 +104,7 @@ MTP for basic routing and error detection.
Summary: Development files for the Osmocom SCCP library
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libosmo-sccp-0_0_6_3 = %version
Requires: libosmo-sccp-0_7_0 = %version
%description -n libosmo-sccp-devel
SCCP is a network layer protocol that provides routing, flow control,
@ -132,24 +132,24 @@ find "$b/%_libdir" -type f -name "*.la" -delete
%check
make %{?_smp_mflags} check
%post -n libosmo-m2ua-0_0_6_3 -p /sbin/ldconfig
%postun -n libosmo-m2ua-0_0_6_3 -p /sbin/ldconfig
%post -n libosmo-mtp-0_0_6_3 -p /sbin/ldconfig
%postun -n libosmo-mtp-0_0_6_3 -p /sbin/ldconfig
%post -n libosmo-sccp-0_0_6_3 -p /sbin/ldconfig
%postun -n libosmo-sccp-0_0_6_3 -p /sbin/ldconfig
%post -n libosmo-xua-0_7_0 -p /sbin/ldconfig
%postun -n libosmo-xua-0_7_0 -p /sbin/ldconfig
%post -n libosmo-mtp-0_7_0 -p /sbin/ldconfig
%postun -n libosmo-mtp-0_7_0 -p /sbin/ldconfig
%post -n libosmo-sccp-0_7_0 -p /sbin/ldconfig
%postun -n libosmo-sccp-0_7_0 -p /sbin/ldconfig
%files -n libosmo-m2ua-0_0_6_3
%files -n libosmo-xua-0_7_0
%defattr(-,root,root)
%_libdir/libosmo-m2ua-%version.so
%_libdir/libosmo-xua-%version.so
%files -n libosmo-m2ua-devel
%files -n libosmo-xua-devel
%defattr(-,root,root)
%dir %_includedir/osmocom
%_includedir/osmocom/m2ua/
%_libdir/libosmo-m2ua.so
%_includedir/osmocom/sigtran/
%_libdir/libosmo-xua.so
%files -n libosmo-mtp-0_0_6_3
%files -n libosmo-mtp-0_7_0
%defattr(-,root,root)
%_libdir/libosmo-mtp-%version.so
@ -160,7 +160,7 @@ make %{?_smp_mflags} check
%_libdir/libosmo-mtp.so
%_libdir/pkgconfig/libosmo-mtp.pc
%files -n libosmo-sccp-0_0_6_3
%files -n libosmo-sccp-0_7_0
%defattr(-,root,root)
%_libdir/libosmo-sccp.so
%_libdir/libosmo-sccp-%version.so