Hello community, here is the log from the commit of package libosmo-sccp for openSUSE:Factory checked in at 2016-02-01 19:55:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-sccp (Old) and /work/SRC/openSUSE:Factory/.libosmo-sccp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-sccp" Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-sccp/libosmo-sccp.changes 2015-09-24 06:14:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libosmo-sccp.new/libosmo-sccp.changes 2016-02-01 19:55:37.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 22 18:33:36 UTC 2016 - jeng...@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 + +------------------------------------------------------------------- Old: ---- libosmo-sccp-0.7.0.tar.xz New: ---- libosmo-sccp-0.7.0.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-sccp.spec ++++++ --- /var/tmp/diff_new_pack.3wl6WA/_old 2016-02-01 19:55:38.000000000 +0100 +++ /var/tmp/diff_new_pack.3wl6WA/_new 2016-02-01 19:55:38.000000000 +0100 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,28 @@ Name: libosmo-sccp +Version: 0.7.0.11 +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-11-gf440267 (--tags) 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 @@ 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,22 @@ This subpackage contains the development files for the Osmocom SCCP library. +%package -n libosmo-sigtran0 +Summary: Osmocom SIGTRAN library +License: AGPL-3.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++ +Requires: libosmo-sigtran0 = %version + +%description -n libosmo-sigtran-devel + %prep %setup -qn %name %patch -P 1 -p1 @@ -121,7 +141,7 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static +%configure --enable-shared --disable-static --includedir="%_includedir/%name" make %{?_smp_mflags} %install @@ -145,8 +165,6 @@ %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 @@ -155,8 +173,9 @@ %files -n libosmo-mtp-devel %defattr(-,root,root) -%dir %_includedir/osmocom -%_includedir/osmocom/mtp/ +%dir %_includedir/%name +%dir %_includedir/%name/osmocom +%_includedir/%name/osmocom/mtp/ %_libdir/libosmo-mtp.so %_libdir/pkgconfig/libosmo-mtp.pc @@ -167,8 +186,21 @@ %files -n libosmo-sccp-devel %defattr(-,root,root) -%dir %_includedir/osmocom -%_includedir/osmocom/sccp/ +%dir %_includedir/%name +%dir %_includedir/%name/osmocom +%_includedir/%name/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/%name +%dir %_includedir/%name/osmocom +%_includedir/%name/osmocom/sigtran/ +%_libdir/libosmo-sigtran.so +%_libdir/pkgconfig/libosmo-sigtran.pc + %changelog ++++++ 0001-build-fixes.patch ++++++ --- /var/tmp/diff_new_pack.3wl6WA/_old 2016-02-01 19:55:38.000000000 +0100 +++ /var/tmp/diff_new_pack.3wl6WA/_new 2016-02-01 19:55:38.000000000 +0100 @@ -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 <jeng...@inai.de> Date: Mon, 21 Jul 2014 10:13:00 +0200 Subject: [PATCH] build: fixes @@ -8,35 +8,33 @@ Rename libmtp to libosmo-mtp, as libmtp is already used by the Multimedia Transfer Protocol library. --- - configure.ac | 4 +++- - libosmo-mtp.pc.in | 2 +- - libosmo-sccp.pc.in | 2 +- - src/Makefile.am | 12 ++++++++---- - tests/m2ua/Makefile.am | 2 +- - tests/sccp/Makefile.am | 4 ++-- - 6 files changed, 16 insertions(+), 10 deletions(-) + configure.ac | 3 ++- + libosmo-mtp.pc.in | 2 +- + libosmo-sccp.pc.in | 2 +- + src/Makefile.am | 14 +++++++++----- + tests/m2ua/Makefile.am | 2 +- + tests/sccp/Makefile.am | 4 ++-- + 6 files changed, 16 insertions(+), 11 deletions(-) -diff --git a/configure.ac b/configure.ac -index 49c5f7e..2f9d29a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,9 +13,11 @@ dnl checks for programs - AC_PROG_MAKE_SET +Index: libosmo-sccp/configure.ac +=================================================================== +--- libosmo-sccp.orig/configure.ac ++++ libosmo-sccp/configure.ac +@@ -14,8 +14,9 @@ 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([LIBOSMOGSM], [libosmogsm]) +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 - saved_CFLAGS="$CFLAGS" -diff --git a/libosmo-mtp.pc.in b/libosmo-mtp.pc.in -index 675d0d3..5e99dd3 100644 ---- a/libosmo-mtp.pc.in -+++ b/libosmo-mtp.pc.in +Index: libosmo-sccp/libosmo-mtp.pc.in +=================================================================== +--- libosmo-sccp.orig/libosmo-mtp.pc.in ++++ libosmo-sccp/libosmo-mtp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Osmo MTP Lib Description: Osmo MTP Lib @@ -44,10 +42,10 @@ -Libs: -L${libdir} -lmtp +Libs: -L${libdir} -losmo-mtp Cflags: -I${includedir}/ -diff --git a/libosmo-sccp.pc.in b/libosmo-sccp.pc.in -index eda8d49..9dd18c1 100644 ---- a/libosmo-sccp.pc.in -+++ b/libosmo-sccp.pc.in +Index: libosmo-sccp/libosmo-sccp.pc.in +=================================================================== +--- libosmo-sccp.orig/libosmo-sccp.pc.in ++++ libosmo-sccp/libosmo-sccp.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: OpenBSC SCCP Lib Description: OpenBSC SCCP Lib @@ -55,41 +53,49 @@ -Libs: -L${libdir} -lsccp +Libs: -L${libdir} -losmo-sccp Cflags: -I${includedir}/ -diff --git a/src/Makefile.am b/src/Makefile.am -index fa47e85..815fb8c 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) +Index: libosmo-sccp/src/Makefile.am +=================================================================== +--- libosmo-sccp.orig/src/Makefile.am ++++ libosmo-sccp/src/Makefile.am +@@ -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} -diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am -index 33618ef..a04145f 100644 ---- a/tests/m2ua/Makefile.am -+++ b/tests/m2ua/Makefile.am + + + # New shared lib +Index: libosmo-sccp/tests/m2ua/Makefile.am +=================================================================== +--- libosmo-sccp.orig/tests/m2ua/Makefile.am ++++ libosmo-sccp/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} -diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am -index 8cce20c..50624ce 100644 ---- a/tests/sccp/Makefile.am -+++ b/tests/sccp/Makefile.am +Index: libosmo-sccp/tests/sccp/Makefile.am +=================================================================== +--- libosmo-sccp.orig/tests/sccp/Makefile.am ++++ libosmo-sccp/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} @@ -103,6 +109,3 @@ -sccp_test_LDADD = $(LIBOSMOCORE_LIBS) +sccp_test_LDADD = $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS} --- -2.4.3 - ++++++ libosmo-sccp-0.7.0.tar.xz -> libosmo-sccp-0.7.0.11.tar.xz ++++++ ++++ 3324 lines of diff (skipped)
