Jan Engelhardt 2013-06-02 23:26:53 +00:00 committed by Git OBS Bridge
parent 20180cdca8
commit fbfb29a741
7 changed files with 74 additions and 24 deletions

View File

@ -0,0 +1,25 @@
From d0ce550251f8d1809f768428c11da0f80f940f10 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 21 Apr 2013 21:04:19 +0200
Subject: [PATCH] osmo-arfcn: Return something from the method
This is a fatal error when building RPMs for OpenSUSE.
---
utils/osmo-arfcn.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c
index 2be3958..5103c97 100644
--- a/utils/osmo-arfcn.c
+++ b/utils/osmo-arfcn.c
@@ -77,6 +77,7 @@ static int freq2arfcn(int freq10, int uplink)
printf("%s: ARFCN %4d\n",
gsm_band_name(gsm_arfcn2band(arfcn)),
arfcn & ~ARFCN_FLAG_MASK);
+ return 0;
}
static void help(const char *progname)
--
1.8.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a66d1f52a81b768d72d7d31b442fcedfb243be1747b129dbff5ee372aca172b
size 250616

3
libosmocore-0.6.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af62c97238b07628021e119bcb6381fe535d27d230a69ad839060408345238cc
size 264916

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Jun 2 23:08:13 UTC 2013 - jengelh@inai.de
- Update to new upstream release 0.6.0
* No changelog was provided
- Add 0001-osmo-arfcn-Return-something-from-the-method.patch
from upstream to provide fix for rpmlint errors
-------------------------------------------------------------------
Sun Feb 17 19:17:54 UTC 2013 - jengelh@inai.de

View File

@ -17,18 +17,20 @@
Name: libosmocore
Summary: Library for openBSC/OsmocomBB utility functions
Summary: Open Source Mobile Communications Core Library
License: GPL-2.0 and GPL-2.0+ and LGPL-3.0+ and AGPL-3.0+
Group: Development/Libraries/C and C++
Version: 0.5.3
Version: 0.6.0
Release: 0
Url: http://bb.osmocom.org/trac/wiki/libosmocore
#Git-Clone: git://git.osmocom.org/libosmocore
# Source created from tag "0.6.0" (commit 533f63f15aa584eec73044802e0a8bc798a313fe)
Source: %name-%version.tar.xz
Patch1: osmo-version.diff
Patch2: osmo-talloc.diff
Patch3: osmo-talloc2.diff
Patch4: 0001-osmo-arfcn-Return-something-from-the-method.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@ -48,6 +50,13 @@ communications.
There is no clear scope of it. It simply houses all code shared
between OsmocomBB and OpenBSC to avoid code duplication.
%package tools
Summary: GSM utilities from the osmocore project
Group: Prodc
%description tools
This package contains GSM utilities from libosmocore.
%package -n libosmocodec0
Summary: Library for Osmocom codec-related utilities
License: GPL-2.0+
@ -62,6 +71,8 @@ Group: Development/Libraries/C and C++
Requires: libosmocodec0 = %version
%description -n libosmocodec-devel
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocodec.
%package -n libosmocore4
Summary: Osmocom core library
@ -83,6 +94,8 @@ Requires: libosmocore4 = %version
Requires: libtalloc-devel
%description -n libosmocore-devel
This subpackage contains libraries and header files for developing
applications that want to make use of libosmocore.
%package -n libosmogb2
Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library
@ -100,6 +113,8 @@ Requires: libosmogb2 = %version
Requires: libosmogsm-devel = %version
%description -n libosmogb-devel
This subpackage contains libraries and header files for developing
applications that want to make use of libosmogb.
%package -n libosmogsm3
Summary: Osmocom GSM core library
@ -116,6 +131,8 @@ Requires: libosmocore-devel = %version
Requires: libosmogsm3 = %version
%description -n libosmogsm-devel
This subpackage contains libraries and header files for developing
applications that want to make use of libosmogsm.
%package -n libosmovty0
Summary: Osmocom VTY interface library
@ -132,12 +149,14 @@ Requires: libosmocore-devel = %version
Requires: libosmovty0 = %version
%description -n libosmovty-devel
This subpackage contains libraries and header files for developing
applications that want to make use of libosmovty.
%define use_system_talloc 1
%prep
%setup -q
%patch -P 1 -P 2 -P 3 -p1
%setup -qn %name
%patch -P 1 -P 2 -P 3 -P 4 -p1
%build
%if 0%{?use_system_talloc}
@ -167,6 +186,10 @@ find "$b/%_libdir" -type f -name "*.la" -delete
%post -n libosmovty0 -p /sbin/ldconfig
%postun -n libosmovty0 -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
%_bindir/osmo-*
%files -n libosmocodec0
%defattr(-,root,root)
%_libdir/libosmocodec.so.0*

View File

@ -15,19 +15,16 @@ talloc_free, but does not link to libtalloc.so. Correct this.
src/gsm/Makefile.am | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index b72a8d4..237e134 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -23,5 +23,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \
Index: libosmocore/src/gsm/Makefile.am
===================================================================
--- libosmocore.orig/src/gsm/Makefile.am
+++ libosmocore/src/gsm/Makefile.am
@@ -22,5 +22,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.
libosmogsm_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libosmogsm.map -version-info $(LIBVERSION)
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
+if !ENABLE_TALLOC
+libosmogsm_la_LIBDADD = -ltalloc
+endif
EXTRA_DIST = libosmogsm.map
--
1.7.10.4

View File

@ -12,11 +12,11 @@ osmocom/core/talloc.h with the single line #include <talloc.h>.
include/Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/Makefile.am b/include/Makefile.am
index dec8eac..71810ef 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -72,9 +72,7 @@ if ENABLE_PLUGIN
Index: libosmocore/include/Makefile.am
===================================================================
--- libosmocore.orig/include/Makefile.am
+++ libosmocore/include/Makefile.am
@@ -76,9 +76,7 @@ if ENABLE_PLUGIN
nobase_include_HEADERS += osmocom/core/plugin.h
endif
@ -26,6 +26,3 @@ index dec8eac..71810ef 100644
if ENABLE_MSGFILE
nobase_include_HEADERS += osmocom/core/msgfile.h
--
1.7.10.4