Accepting request 560521 from home:mnhauke:osmocom:latest

Update to new upstream release 0.2.0 OBS-URL: https://build.opensuse.org/request/show/560521 OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-iuh?expand=0&rev=4
2018-01-01 22:01:46 +00:00 · 2018-01-01 22:01:46 +00:00 · 507f2a02b7
commit 507f2a02b7
parent 3733bfa407
6 changed files with 105 additions and 21 deletions
--- a/0001-fix-compiler-warning-implicit-function-declaration-i.patch
+++ b/0001-fix-compiler-warning-implicit-function-declaration-i.patch
@ -0,0 +1,28 @@
+From 1ce7ac8cb973e0b694c52659429f992e0b56e359 Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Fri, 30 Dec 2016 11:12:06 +0100
+Subject: [PATCH] fix compiler warning: implicit-function-declaration in
+ hnbgw_vty.c
+
+hnbgw_vty.c:233:2: warning: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration]
+  if (addr && (strcmp(addr, HNBGW_LOCAL_IP_DEFAULT) != 0))
+---
+ src/hnbgw_vty.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c
+index 59871da..e40b077 100644
+--- a/src/hnbgw_vty.c
+++ b/src/hnbgw_vty.c
+@@ -18,6 +18,8 @@
+  *
+  */
+ 
+#include <string.h>
+
+ #include <osmocom/vty/command.h>
+ 
+ #include <osmocom/iuh/vty.h>
+-- 
+2.6.6
+
--- a/5
+++ b/5
@ -2,9 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git://git.osmocom.org/osmo-iuh</param>
-		<param name="revision">master</param>
-		<param name="parent-tag">a97e436ce5f9fcd00275fba2b3cc81190dd38167</param>
-		<param name="versionformat">0.0~g@TAG_OFFSET@</param>
+		<param name="revision">0.2.0</param>
+	        <param name="versionformat">@PARENT_TAG@</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
--- a/osmo-iuh-0.0~g435.tar.xz
+++ b/osmo-iuh-0.0~g435.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:783a012fd1aa8a70609cfe66747e0a70e4cdd2449ed4d918cb8189368f50bd89
-size 10089944
--- a/osmo-iuh-0.2.0.tar.xz
+++ b/osmo-iuh-0.2.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8295e0fb139bc3016f046330beeff58a6b60d73c701982239c46e83ebf270399
+size 10189156
--- a/osmo-iuh.changes
+++ b/osmo-iuh.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec 27 11:08:55 UTC 2017 - mardnh@gmx.de
+
+- Update to new upstream release 0.2.0
+  * No changelog was provided
+- Add patch:
+  * 0001-fix-compiler-warning-implicit-function-declaration-i.patch
+- Specfile cleanup
+
 -------------------------------------------------------------------
 Sat Apr 29 00:08:32 UTC 2017 - jengelh@inai.de

--- a/osmo-iuh.spec
+++ b/osmo-iuh.spec
@ -15,44 +15,92 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-
 Name:           osmo-iuh
-Version:        0.0~g435
+Version:        0.2.0
 Release:        0
-Summary:        Osmocom Iuh experimenation code
-License:        AGPL-3.0+ and GPL-2.0+
+Summary:        Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
+License:        AGPL-3.0+ AND GPL-2.0+
 Group:          Hardware/Mobile
-Url:            http://openbsc.osmocom.org/
-
-Source:         %name-%version.tar.xz
+URL:            https://osmocom.org/projects/osmohnbgw/wiki
+Source:         %{name}-%{version}.tar.xz
+Patch0:         0001-fix-compiler-warning-implicit-function-declaration-i.patch
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
 BuildRequires:  lksctp-tools-devel
+BuildRequires:  pkgconfig
+# python2 for asn1tostruct.py
+BuildRequires:  python2
 BuildRequires:  xz
-BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libosmocore)
-BuildRequires:  pkgconfig(libosmogsm)
-BuildRequires:  pkgconfig(libosmovty)
+BuildRequires:  pkgconfig(libasn1c)
 BuildRequires:  pkgconfig(libosmo-netif)
 BuildRequires:  pkgconfig(libosmo-sigtran)
-BuildRequires:  pkgconfig(libasn1c)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(libosmocore)
+BuildRequires:  pkgconfig(libosmogb)
+BuildRequires:  pkgconfig(libosmogsm)
+BuildRequires:  pkgconfig(libosmovty)

 %description
+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
+
+%package -n libosmo-ranap1
+Summary:        Shared Library part of libosmo-ranap
+Group:          System/Libraries
+
+%description -n libosmo-ranap1
+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
+
+%package -n libosmo-ranap-devel
+Summary:        Development files for Osmocom RANAP library
+Group:          Development/Libraries/C and C++
+Requires:       libosmo-ranap1 = %{version}
+
+%description -n libosmo-ranap-devel
+Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
+
+This subpackage contains libraries and header files for developing
+applications that want to make use of libosmoranap.

 %prep
 %setup -q
+%patch0 -p1

 %build
-echo "%version" >.tarball-version
+echo "%{version}" >.tarball-version
 autoreconf -fi
-%configure
+# FIXME: set CFLAGS for workaround lots of rpm post-build-check errors: "no-return-in-nonvoid-function"
+export CFLAGS="%{optflags} -Wno-return-type"
+%configure \
+  --disable-static \
+  --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags}

 %install
 %make_install
+find %{buildroot} -type f -name "*.la" -delete -print

 %check
 make %{?_smp_mflags} check

+%post   -n libosmo-ranap1 -p /sbin/ldconfig
+%postun -n libosmo-ranap1 -p /sbin/ldconfig
+
 %files
+%doc COPYING README.md
+%dir %{_docdir}/%{name}/examples
+%{_docdir}/%{name}/examples/osmo-hnbgw.cfg
+%{_bindir}/osmo-hnbgw
+
+%files -n libosmo-ranap1
+%{_libdir}/libosmo-ranap.so.1*
+
+%files -n libosmo-ranap-devel
+%dir %{_includedir}/osmocom
+%dir %{_includedir}/osmocom/ranap
+%{_includedir}/osmocom/ranap/RANAP_*.h
+%{_includedir}/osmocom/ranap/ranap_*.h
+%{_includedir}/osmocom/ranap/iu_helpers.h
+%{_includedir}/osmocom/ranap/iu_client.h
+%{_libdir}/libosmo-ranap.so
+%{_libdir}/pkgconfig/libosmo-ranap.pc
+
+%changelog