From ac4a68f0e8413f84e69be5e9b2f094a09a9155f538d31458ea71a559f90b7148 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 29 Jan 2019 08:12:33 +0000 Subject: [PATCH] Accepting request 669397 from home:mnhauke:osmocom:latest - Update to new upstream release 1.0.0 * Bugfix release only. The full changelog is available via http://git.osmocom.org/libosmo-sccp/plain/debian/changelog?h=1.0.0 - Update patch: * 0001-build-fixes.patch OBS-URL: https://build.opensuse.org/request/show/669397 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=29 --- 0001-build-fixes.patch | 63 +++++++++++++++++++------------------- _service | 4 +-- libosmo-sccp-0.10.0.tar.xz | 3 -- libosmo-sccp-1.0.0.tar.xz | 3 ++ libosmo-sccp.changes | 10 ++++++ libosmo-sccp.spec | 38 +++++++++++++---------- 6 files changed, 68 insertions(+), 53 deletions(-) delete mode 100644 libosmo-sccp-0.10.0.tar.xz create mode 100644 libosmo-sccp-1.0.0.tar.xz diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index 259105d..e783bf7 100644 --- a/0001-build-fixes.patch +++ b/0001-build-fixes.patch @@ -3,12 +3,11 @@ From: Jan Engelhardt Date: Mon, 21 Jul 2014 10:13:00 +0200 Subject: [PATCH] build: fixes -AC_PROG_LIBTOOL is the same as LT_INIT. 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 | 1 + + configure.ac | 2 +- libosmo-mtp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +- src/Makefile.am | 20 +++++++++++++++----- @@ -16,24 +15,26 @@ Multimedia Transfer Protocol library. tests/sccp/Makefile.am | 4 ++-- tests/ss7/Makefile.am | 2 -- tests/xua/Makefile.am | 6 ++---- - 8 files changed, 23 insertions(+), 16 deletions(-) + 8 files changed, 23 insertions(+), 17 deletions(-) -Index: libosmo-sccp-0.10.0/configure.ac +Index: libosmo-sccp-0.8.1/configure.ac =================================================================== ---- libosmo-sccp-0.10.0.orig/configure.ac -+++ libosmo-sccp-0.10.0/configure.ac -@@ -29,6 +29,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno" +--- 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" fi PKG_PROG_PKG_CONFIG([0.20]) +PKG_CHECK_MODULES([TALLOC], [talloc]) - PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0) - PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0) - PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0) -Index: libosmo-sccp-0.10.0/libosmo-mtp.pc.in + PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) + +Index: libosmo-sccp-0.8.1/libosmo-mtp.pc.in =================================================================== ---- libosmo-sccp-0.10.0.orig/libosmo-mtp.pc.in -+++ libosmo-sccp-0.10.0/libosmo-mtp.pc.in +--- libosmo-sccp-0.8.1.orig/libosmo-mtp.pc.in ++++ libosmo-sccp-0.8.1/libosmo-mtp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Osmo MTP Lib Description: Osmo MTP Lib @@ -41,10 +42,10 @@ Index: libosmo-sccp-0.10.0/libosmo-mtp.pc.in -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.10.0/libosmo-sccp.pc.in +Index: libosmo-sccp-0.8.1/libosmo-sccp.pc.in =================================================================== ---- libosmo-sccp-0.10.0.orig/libosmo-sccp.pc.in -+++ libosmo-sccp-0.10.0/libosmo-sccp.pc.in +--- libosmo-sccp-0.8.1.orig/libosmo-sccp.pc.in ++++ libosmo-sccp-0.8.1/libosmo-sccp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib @@ -52,10 +53,10 @@ Index: libosmo-sccp-0.10.0/libosmo-sccp.pc.in -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -Index: libosmo-sccp-0.10.0/src/Makefile.am +Index: libosmo-sccp-0.8.1/src/Makefile.am =================================================================== ---- libosmo-sccp-0.10.0.orig/src/Makefile.am -+++ libosmo-sccp-0.10.0/src/Makefile.am +--- libosmo-sccp-0.8.1.orig/src/Makefile.am ++++ libosmo-sccp-0.8.1/src/Makefile.am @@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h xua_asp # Legacy static libs @@ -91,20 +92,20 @@ Index: libosmo-sccp-0.10.0/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.10.0/tests/m2ua/Makefile.am +Index: libosmo-sccp-0.8.1/tests/m2ua/Makefile.am =================================================================== ---- libosmo-sccp-0.10.0.orig/tests/m2ua/Makefile.am -+++ libosmo-sccp-0.10.0/tests/m2ua/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp-0.8.1/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.10.0/tests/sccp/Makefile.am +Index: libosmo-sccp-0.8.1/tests/sccp/Makefile.am =================================================================== ---- libosmo-sccp-0.10.0.orig/tests/sccp/Makefile.am -+++ libosmo-sccp-0.10.0/tests/sccp/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/sccp/Makefile.am ++++ libosmo-sccp-0.8.1/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} @@ -118,10 +119,10 @@ Index: libosmo-sccp-0.10.0/tests/sccp/Makefile.am -sccp_test_LDADD = $(LIBOSMOCORE_LIBS) +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} -Index: libosmo-sccp-0.10.0/tests/ss7/Makefile.am +Index: libosmo-sccp-0.8.1/tests/ss7/Makefile.am =================================================================== ---- libosmo-sccp-0.10.0.orig/tests/ss7/Makefile.am -+++ libosmo-sccp-0.10.0/tests/ss7/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/ss7/Makefile.am ++++ libosmo-sccp-0.8.1/tests/ss7/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) @@ -130,10 +131,10 @@ Index: libosmo-sccp-0.10.0/tests/ss7/Makefile.am LDADD = $(top_builddir)/src/libosmo-sigtran.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) -Index: libosmo-sccp-0.10.0/tests/xua/Makefile.am +Index: libosmo-sccp-0.8.1/tests/xua/Makefile.am =================================================================== ---- libosmo-sccp-0.10.0.orig/tests/xua/Makefile.am -+++ libosmo-sccp-0.10.0/tests/xua/Makefile.am +--- libosmo-sccp-0.8.1.orig/tests/xua/Makefile.am ++++ libosmo-sccp-0.8.1/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/_service b/_service index 1f8cd93..2b18ab5 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/libosmo-sccp - 0.10.0 - 0.10.0 + 1.0.0 + 1.0.0 *.tar diff --git a/libosmo-sccp-0.10.0.tar.xz b/libosmo-sccp-0.10.0.tar.xz deleted file mode 100644 index eb75b10..0000000 --- a/libosmo-sccp-0.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbd4cc5f795c6f264696008786b91527c89e55e990f31e4a0feade74e1b6caf7 -size 187140 diff --git a/libosmo-sccp-1.0.0.tar.xz b/libosmo-sccp-1.0.0.tar.xz new file mode 100644 index 0000000..4f5f841 --- /dev/null +++ b/libosmo-sccp-1.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:103777b897a48579520adadd3c233cff51ef6f62d1b2d6ef9c23a7fd5d36147e +size 199636 diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index a1143ce..e7c3110 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jan 28 23:21:43 UTC 2019 - mardnh@gmx.de + +- Update to new upstream release 1.0.0 + * Bugfix release only. + The full changelog is available via + http://git.osmocom.org/libosmo-sccp/plain/debian/changelog?h=1.0.0 +- Update patch: + * 0001-build-fixes.patch + ------------------------------------------------------------------- Tue Dec 11 00:47:07 UTC 2018 - Jan Engelhardt diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index 76fe4b9..2e1d653 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-sccp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libosmo-sccp -Version: 0.10.0 +Version: 1.0.0 Release: 0 %define libversion %(echo "%version" | sed 's/\\./_/g') Summary: Osmocom library for the A-bis interface between BTS and BSC @@ -35,10 +35,10 @@ BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 BuildRequires: systemd-rpm-macros BuildRequires: xz -BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0 -BuildRequires: pkgconfig(libosmocore) >= 0.12.0 -BuildRequires: pkgconfig(libosmogsm) >= 0.12.0 -BuildRequires: pkgconfig(libosmovty) >= 0.12.0 +BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.0.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 +BuildRequires: pkgconfig(libosmovty) >= 1.0.0 %description SCCP is a network layer protocol that provides extended routing, flow @@ -96,19 +96,19 @@ in SS7 telecommunications networks. This subpackage contains the development files for the Osmocom SCCP library. -%package -n libosmo-sigtran0 +%package -n libosmo-sigtran3 Summary: Osmocom SIGTRAN library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmo-sigtran0 +%description -n libosmo-sigtran3 Osmocom implementation of (parts of) SIGTRAN. %package -n libosmo-sigtran-devel Summary: Development files for the Osmocom sigtran library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmo-sigtran0 = %version +Requires: libosmo-sigtran3 = %version %description -n libosmo-sigtran-devel Osmocom implementation of (parts of) SIGTRAN. @@ -159,14 +159,16 @@ a STP, such as Global Title Routing, Global Title Translation. %build echo "%version" >.tarball-version autoreconf -fiv -%configure --disable-static --includedir="%_includedir/%name" \ - --docdir="%_defaultdocdir/%name" +%configure \ + --disable-static \ + --includedir="%_includedir/%name" \ + --docdir="%_defaultdocdir/%name" \ + --with-systemdsystemunitdir=%_unitdir make %{?_smp_mflags} %install %make_install find "%buildroot/%_libdir" -type f -name "*.la" -delete -install -D -m 0644 contrib/systemd/osmo-stp.service %buildroot%_unitdir/osmo-stp.service install -d "%buildroot/%_unitdir" "%buildroot/%_sbindir" ln -s service "%buildroot/%_sbindir/rcosmo-stp" @@ -183,8 +185,8 @@ fi %postun -n libosmo-mtp-%libversion -p /sbin/ldconfig %post -n libosmo-sccp-%libversion -p /sbin/ldconfig %postun -n libosmo-sccp-%libversion -p /sbin/ldconfig -%post -n libosmo-sigtran0 -p /sbin/ldconfig -%postun -n libosmo-sigtran0 -p /sbin/ldconfig +%post -n libosmo-sigtran3 -p /sbin/ldconfig +%postun -n libosmo-sigtran3 -p /sbin/ldconfig %post -n libosmo-xua-%libversion -p /sbin/ldconfig %postun -n libosmo-xua-%libversion -p /sbin/ldconfig @@ -224,9 +226,9 @@ fi %_includedir/%name/osmocom/sccp/ %_libdir/pkgconfig/libosmo-sccp.pc -%files -n libosmo-sigtran0 +%files -n libosmo-sigtran3 %defattr(-,root,root) -%_libdir/libosmo-sigtran.so.0* +%_libdir/libosmo-sigtran.so.3* %files -n libosmo-sigtran-devel %defattr(-,root,root) @@ -246,6 +248,8 @@ fi %_libdir/pkgconfig/libosmo-xua.pc %files -n osmo-stp +%dir %{_sysconfdir}/osmocom +%config %{_sysconfdir}/osmocom/osmo-stp.cfg %_bindir/osmo-stp %_sbindir/rcosmo-stp %_unitdir/osmo-stp.service