diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index 5cb7444..29e6ab1 100644 --- a/0001-build-fixes.patch +++ b/0001-build-fixes.patch @@ -7,21 +7,21 @@ 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 | 2 +- + configure.ac | 1 + libosmo-mtp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +- src/Makefile.am | 20 +++++++++++++++----- tests/m2ua/Makefile.am | 2 +- - tests/sccp/Makefile.am | 4 ++-- + tests/sccp/Makefile.am | 3 ++- tests/ss7/Makefile.am | 2 -- tests/xua/Makefile.am | 6 ++---- - 8 files changed, 23 insertions(+), 17 deletions(-) + 8 files changed, 23 insertions(+), 15 deletions(-) -Index: libosmo-sccp-0.8.1/configure.ac +Index: libosmo-sccp-1.2.0/configure.ac =================================================================== ---- libosmo-sccp-0.8.1.orig/configure.ac -+++ libosmo-sccp-0.8.1/configure.ac -@@ -30,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" +--- libosmo-sccp-1.2.0.orig/configure.ac ++++ libosmo-sccp-1.2.0/configure.ac +@@ -29,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" fi PKG_PROG_PKG_CONFIG([0.20]) @@ -29,12 +29,10 @@ Index: libosmo-sccp-0.8.1/configure.ac PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) - PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) - -Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in +Index: libosmo-sccp-1.2.0/libosmo-mtp.pc.in =================================================================== ---- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in -+++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in +--- libosmo-sccp-1.2.0.orig/libosmo-mtp.pc.in ++++ libosmo-sccp-1.2.0/libosmo-mtp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Osmo MTP Lib Description: Osmo MTP Lib @@ -42,10 +40,10 @@ Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in +Index: libosmo-sccp-1.2.0/libosmo-sccp.pc.in =================================================================== ---- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in -+++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in +--- libosmo-sccp-1.2.0.orig/libosmo-sccp.pc.in ++++ libosmo-sccp-1.2.0/libosmo-sccp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib @@ -53,10 +51,10 @@ Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.8.1/src/Makefile.am +Index: libosmo-sccp-1.2.0/src/Makefile.am =================================================================== ---- libosmo-sccp-0.8.1.orig/src/Makefile.am -+++ libosmo-sccp-0.8.1/src/Makefile.am +--- libosmo-sccp-1.2.0.orig/src/Makefile.am ++++ libosmo-sccp-1.2.0/src/Makefile.am @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp # Legacy static libs @@ -92,20 +90,37 @@ Index: libosmo-sccp-0.8.1/src/Makefile.am +noinst_LTLIBRARIES = libosmo-sigtran-internal.la +libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES) +libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD) -Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am +Index: libosmo-sccp-1.2.0/tests/m2ua/Makefile.am =================================================================== ---- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am -+++ libosmo-sccp-0.8.1/tests/m2ua/Makefile.am +--- libosmo-sccp-1.2.0.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp-1.2.0/tests/m2ua/Makefile.am @@ -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/libxua.a $(LIBOSMOCORE_LIBS) +m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} -Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am +Index: libosmo-sccp-1.2.0/tests/sccp/Makefile.am =================================================================== ---- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am -+++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am +--- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am ++++ libosmo-sccp-1.2.0/tests/sccp/Makefile.am +@@ -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 +@@ -9,5 +9,6 @@ sccp_test_SOURCES = sccp_test.c + sccp_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(top_builddir)/src/sccp.o \ ++ ${TALLOC_LIBS} \ + $(NULL) + +Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am +=================================================================== +--- libosmo-sccp-1.2.0.orig/tests/ss7/Makefile.am ++++ libosmo-sccp-1.2.0/tests/ss7/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) @@ -114,10 +129,10 @@ Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am +Index: libosmo-sccp-1.2.0/tests/xua/Makefile.am =================================================================== ---- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am -+++ libosmo-sccp-0.8.1/tests/xua/Makefile.am +--- libosmo-sccp-1.2.0.orig/tests/xua/Makefile.am ++++ libosmo-sccp-1.2.0/tests/xua/Makefile.am @@ -1,8 +1,6 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS) diff --git a/0002-build-fixes.patch b/0002-build-fixes.patch deleted file mode 100644 index 71312aa..0000000 --- a/0002-build-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am -index 85dbe64..ad7ddf3 100644 ---- a/tests/sccp/Makefile.am -+++ b/tests/sccp/Makefile.am -@@ -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 -@@ -9,5 +9,6 @@ sccp_test_SOURCES = sccp_test.c - sccp_test_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(top_builddir)/src/sccp.o \ -+ ${TALLOC_LIBS} \ - $(NULL) - diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index b72ebd0..c64e295 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -10,10 +10,6 @@ Sun Jan 5 10:19:06 UTC 2020 - Martin Hauke selection * ipa: Fix crash when parsing of received IPA SCCP message fails * ipa: Don't send non-SCCP data over IPA/SCCPlite -- Update patch - * 0001-build-fixes.patch -- Add patch - * 0002-build-fixes.patch ------------------------------------------------------------------- Thu Aug 15 04:44:32 UTC 2019 - Jan Engelhardt diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 43da5f5..bd0be42 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-sccp # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Release: 0 Summary: Osmocom library for the A-bis interface between BTS and BSC License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Hardware/Mobile -Url: https://projects.osmocom.org/projects/libosmo-sccp +URL: https://projects.osmocom.org/projects/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp Source: %name-%version.tar.xz