<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/18278">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: integrate RPM spec<br><br>Remove OpenSUSE bug report link, set version to @VERSION@, make it build with<br>CentOS 8 etc.<br><br>Do not try to build libsscp, libmtp and libxua as shared libraries. The<br>imported spec file patched the source with "0001-build-fixes.patch" (not<br>imported) and packaged resulting so files. However, these libraries are<br>legacy and built statically on purpose, as it's stated on the wiki page:<br>https://osmocom.org/projects/libosmo-sccp/wiki<br><br>Related: OS#4550<br>Change-Id: Id1d77a79b43a9cb967fe3fe10394cca24757af85<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/libosmo-sccp.spec.in<br>3 files changed, 14 insertions(+), 64 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 848c94c..252f6f5 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -83,3 +83,5 @@</span><br><span> doc/html.tar</span><br><span> doc/libosmo-sigtran.tag</span><br><span> doc/sigtran</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+contrib/libosmo-sccp.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index fdd6941..33b71b7 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -203,5 +203,6 @@</span><br><span> doc/manuals/Makefile</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/libosmo-sccp.spec</span><br><span> Doxyfile</span><br><span> Makefile)</span><br><span>diff --git a/contrib/libosmo-sccp.spec b/contrib/libosmo-sccp.spec.in</span><br><span>similarity index 69%</span><br><span>rename from contrib/libosmo-sccp.spec</span><br><span>rename to contrib/libosmo-sccp.spec.in</span><br><span>index 11d661c..b4d7722 100644</span><br><span>--- a/contrib/libosmo-sccp.spec</span><br><span>+++ b/contrib/libosmo-sccp.spec.in</span><br><span>@@ -12,30 +12,27 @@</span><br><span> # license that conforms to the Open Source Definition (Version 1.9)</span><br><span> # published by the Open Source Initiative.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Please submit bugfixes or comments via http://bugs.opensuse.org/</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%define libversion %(echo "%{version}" |sed 's/\\./_/g')</span><br><span> Name: libosmo-sccp</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 1.2.0.36</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom library for the A-bis interface between BTS and BSC</span><br><span> License: AGPL-3.0-or-later AND GPL-2.0-or-later</span><br><span> Group: Hardware/Mobile</span><br><span style="color: hsl(0, 100%, 40%);">-URL: https://projects.osmocom.org/projects/libosmo-sccp</span><br><span style="color: hsl(0, 100%, 40%);">-#Git-Clone: git://git.osmocom.org/libosmo-sccp</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/libosmo-sccp</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span style="color: hsl(0, 100%, 40%);">-Patch0: 0001-build-fixes.patch</span><br><span> BuildRequires: automake >= 1.6</span><br><span> BuildRequires: libtool >= 2</span><br><span> BuildRequires: lksctp-tools-devel</span><br><span> BuildRequires: pkgconfig >= 0.20</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> BuildRequires: systemd-rpm-macros</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> BuildRequires: xz</span><br><span> BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 1.0.0</span><br><span> BuildRequires: pkgconfig(libosmogsm) >= 1.0.0</span><br><span> BuildRequires: pkgconfig(libosmovty) >= 1.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+%{?systemd_requires}</span><br><span> </span><br><span> %description</span><br><span> SCCP is a network layer protocol that provides extended routing, flow</span><br><span>@@ -43,22 +40,10 @@</span><br><span> facilities in Signaling System 7 telecommunications networks. SCCP is</span><br><span> heavily used in cellular networks such as GSM.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%package -n libosmo-mtp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-Summary: Osmocom Message Transfer Part library</span><br><span style="color: hsl(0, 100%, 40%);">-License: GPL-2.0-or-later</span><br><span style="color: hsl(0, 100%, 40%);">-Group: System/Libraries</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%description -n libosmo-mtp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-The Message Transfer Part (MTP) is part of the Signaling System 7</span><br><span style="color: hsl(0, 100%, 40%);">-(SS7) used for communication in Public Switched Telephone Networks.</span><br><span style="color: hsl(0, 100%, 40%);">-MTP is responsible for reliable, unduplicated and in-sequence</span><br><span style="color: hsl(0, 100%, 40%);">-transport of SS7 messages between communication partners.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %package -n libosmo-mtp-devel</span><br><span> Summary: Development files for the Osmocom MTP library</span><br><span> License: GPL-2.0-or-later</span><br><span> Group: Development/Libraries/C and C++</span><br><span style="color: hsl(0, 100%, 40%);">-Requires: libosmo-mtp-%{libversion} = %{version}</span><br><span> </span><br><span> %description -n libosmo-mtp-devel</span><br><span> MTP is part of SS7 used for communication in Public Switched</span><br><span>@@ -67,23 +52,10 @@</span><br><span> This subpackage contains the development files for the Osmocom MTP</span><br><span> library.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%package -n libosmo-sccp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-Summary: Osmocom Signalling Connection Control Part library</span><br><span style="color: hsl(0, 100%, 40%);">-License: GPL-2.0-or-later</span><br><span style="color: hsl(0, 100%, 40%);">-Group: System/Libraries</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%description -n libosmo-sccp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-The Signalling Connection Control Part (SCCP) is a network layer</span><br><span style="color: hsl(0, 100%, 40%);">-protocol that provides extended routing, flow control, segmentation,</span><br><span style="color: hsl(0, 100%, 40%);">-connection-orientation, and error correction facilities in Signaling</span><br><span style="color: hsl(0, 100%, 40%);">-System 7 telecommunications networks. SCCP relies on the services of</span><br><span style="color: hsl(0, 100%, 40%);">-MTP for basic routing and error detection.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %package -n libosmo-sccp-devel</span><br><span> Summary: Development files for the Osmocom SCCP library</span><br><span> License: GPL-2.0-or-later</span><br><span> Group: Development/Libraries/C and C++</span><br><span style="color: hsl(0, 100%, 40%);">-Requires: libosmo-sccp-%{libversion} = %{version}</span><br><span> </span><br><span> %description -n libosmo-sccp-devel</span><br><span> SCCP is a network layer protocol that provides routing, flow control,</span><br><span>@@ -113,22 +85,11 @@</span><br><span> This subpackage contains the development files for the Osmocom</span><br><span> SIGTRAN library.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%package -n libosmo-xua-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-Summary: Osmocom Message Transfer Part 2 User Adaptation library</span><br><span style="color: hsl(0, 100%, 40%);">-License: GPL-2.0-or-later</span><br><span style="color: hsl(0, 100%, 40%);">-Group: System/Libraries</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%description -n libosmo-xua-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-M2UA (RFC 3331) provides an SCTP (RFC 3873) adaptation layer for the</span><br><span style="color: hsl(0, 100%, 40%);">-seamless backhaul of MTP Level 2 user messages and service interface</span><br><span style="color: hsl(0, 100%, 40%);">-across an IP network.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %package -n libosmo-xua-devel</span><br><span> Summary: Development files for the Osmocom M2UA library</span><br><span> License: GPL-2.0-or-later</span><br><span> Group: Development/Libraries/C and C++</span><br><span> Requires: libosmo-sigtran-devel = %{version}</span><br><span style="color: hsl(0, 100%, 40%);">-Requires: libosmo-xua-%{libversion} = %{version}</span><br><span> </span><br><span> %description -n libosmo-xua-devel</span><br><span> M2UA provides an SCTP adaptation layer for MTP level 2 user messages</span><br><span>@@ -151,14 +112,12 @@</span><br><span> </span><br><span> %prep</span><br><span> %setup -q</span><br><span style="color: hsl(0, 100%, 40%);">-%patch0 -p1</span><br><span> </span><br><span> %build</span><br><span> echo "%{version}" >.tarball-version</span><br><span> autoreconf -fiv</span><br><span> %configure \</span><br><span> --enable-shared \</span><br><span style="color: hsl(0, 100%, 40%);">- --disable-static \</span><br><span> --includedir="%{_includedir}/%{name}" \</span><br><span> --docdir="%{_docdir}/%{name}" \</span><br><span> --with-systemdsystemunitdir=%{_unitdir}</span><br><span>@@ -171,37 +130,27 @@</span><br><span> %check</span><br><span> make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%post -n libosmo-mtp-%{libversion} -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%postun -n libosmo-mtp-%{libversion} -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%post -n libosmo-sccp-%{libversion} -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%postun -n libosmo-sccp-%{libversion} -p /sbin/ldconfig</span><br><span> %post -n libosmo-sigtran5 -p /sbin/ldconfig</span><br><span> %postun -n libosmo-sigtran5 -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%post -n libosmo-xua-%{libversion} -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%postun -n libosmo-xua-%{libversion} -p /sbin/ldconfig</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> %preun -n osmo-stp %service_del_preun osmo-stp.service</span><br><span> %postun -n osmo-stp %service_del_postun osmo-stp.service</span><br><span> %pre -n osmo-stp %service_add_pre osmo-stp.service</span><br><span> %post -n osmo-stp %service_add_post osmo-stp.service</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%files -n libosmo-mtp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-mtp-%{version}.so</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %files -n libosmo-mtp-devel</span><br><span> %dir %{_includedir}/%{name}</span><br><span> %dir %{_includedir}/%{name}/osmocom</span><br><span> %{_includedir}/%{name}/osmocom/mtp/</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-mtp.so</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libmtp.a</span><br><span> %{_libdir}/pkgconfig/libosmo-mtp.pc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%files -n libosmo-sccp-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-sccp.so</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-sccp-%{version}.so</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %files -n libosmo-sccp-devel</span><br><span> %dir %{_includedir}/%{name}</span><br><span> %dir %{_includedir}/%{name}/osmocom</span><br><span> %{_includedir}/%{name}/osmocom/sccp/</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libsccp.a</span><br><span> %{_libdir}/pkgconfig/libosmo-sccp.pc</span><br><span> </span><br><span> %files -n libosmo-sigtran5</span><br><span>@@ -212,13 +161,11 @@</span><br><span> %dir %{_includedir}/%{name}/osmocom</span><br><span> %{_includedir}/%{name}/osmocom/sigtran</span><br><span> %{_libdir}/libosmo-sigtran.so</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-sigtran.a</span><br><span> %{_libdir}/pkgconfig/libosmo-sigtran.pc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%files -n libosmo-xua-%{libversion}</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-xua-%{version}.so</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %files -n libosmo-xua-devel</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-xua.so</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libxua.a</span><br><span> %{_libdir}/pkgconfig/libosmo-xua.pc</span><br><span> </span><br><span> %files -n osmo-stp</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/18278">change 18278</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/18278"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id1d77a79b43a9cb967fe3fe10394cca24757af85 </div>
<div style="display:none"> Gerrit-Change-Number: 18278 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>