From dbea067089830d000da5462b6a4f7bd78722a74d8a514c48d8a1b3a8e36697a1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 22 Feb 2013 08:03:06 +0000 Subject: [PATCH] Accepting request 155677 from home:jengelh:branches:network:telephony First set of libraries for Osmocom OBS-URL: https://build.opensuse.org/request/show/155677 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-abis?expand=0&rev=1 --- .gitattributes | 23 ++++++++ .gitignore | 1 + libosmo-abis-0.1.5.tar.xz | 3 + libosmo-abis.spec | 120 ++++++++++++++++++++++++++++++++++++++ osmo-talloc.diff | 39 +++++++++++++ osmo-version.diff | 23 ++++++++ 6 files changed, 209 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 libosmo-abis-0.1.5.tar.xz create mode 100644 libosmo-abis.spec create mode 100644 osmo-talloc.diff create mode 100644 osmo-version.diff diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/libosmo-abis-0.1.5.tar.xz b/libosmo-abis-0.1.5.tar.xz new file mode 100644 index 0000000..c6c7e2e --- /dev/null +++ b/libosmo-abis-0.1.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49e65d3666fe8c933b811f77dd1d5c3f4e51075ac57ea9a9040f90d6b39c9149 +size 62592 diff --git a/libosmo-abis.spec b/libosmo-abis.spec new file mode 100644 index 0000000..ca11b36 --- /dev/null +++ b/libosmo-abis.spec @@ -0,0 +1,120 @@ +# +# spec file for package libosmo-abis +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: libosmo-abis +Summary: Osmocom library for A-bis interface +License: AGPL-3.0+ and GPL-2.0+ +Group: Development/Libraries/C and C++ +Version: 0.1.5 +Release: 0 +Url: http://osmocom.org/ + +#Git-Clone: git://git.osmocom.org/libosmo-abis +Source: %name-%version.tar.xz +Patch1: osmo-version.diff +Patch2: osmo-talloc.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake >= 1.6 +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xz +BuildRequires: pkgconfig(libosmocore) >= 0.3.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.3.10 +BuildRequires: pkgconfig(libosmovty) >= 0.3.0 +BuildRequires: pkgconfig(ortp) >= 0.13.1 + +%description + +%package -n libosmoabis1 +Summary: A-bis core library +License: AGPL-3.0+ +Group: System/Libraries + +%description -n libosmoabis1 + +%package -n libosmoabis-devel +Summary: Development files for the Osmocom A-bis core library +License: AGPL-3.0+ +Group: Development/Libraries/C and C++ +Requires: libosmoabis1 = %version +Requires: libosmocore-devel >= 0.3.0 +Requires: libosmogsm-devel >= 0.3.10 + +%description -n libosmoabis-devel + +%package -n libosmotrau0 +Summary: Osmocom TRAU (E1/RTP) library +License: GPL-2.0+ +Group: System/Libraries + +%description -n libosmotrau0 + +%package -n libosmotrau-devel +Summary: Development files for the Osmocom TRAU (E1/RTP) library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +Requires: libosmotrau0 = %version + +%description -n libosmotrau-devel + +%prep +%setup -q +%patch -P 1 -P 2 -p1 + +%build +autoreconf -fiv +%configure --enable-shared --disable-static --disable-talloc +make %{?_smp_mflags} + +%install +b="%buildroot" +make %{?_smp_mflags} install DESTDIR="$b" +find "$b/%_libdir" -type f -name "*.la" -delete + +%check +make %{?_smp_mflags} check + +%post -n libosmoabis1 -p /sbin/ldconfig +%postun -n libosmoabis1 -p /sbin/ldconfig +%post -n libosmotrau0 -p /sbin/ldconfig +%postun -n libosmotrau0 -p /sbin/ldconfig + +%files -n libosmoabis1 +%defattr(-,root,root) +%_libdir/libosmoabis.so.1* + +%files -n libosmoabis-devel +%defattr(-,root,root) +%dir %_includedir/osmocom +%_includedir/osmocom/abis/ +%_libdir/libosmoabis.so +%_libdir/pkgconfig/libosmoabis.pc + +%files -n libosmotrau0 +%defattr(-,root,root) +%_libdir/libosmotrau.so.0* + +%files -n libosmotrau-devel +%defattr(-,root,root) +%dir %_includedir/osmocom +%_includedir/osmocom/trau +%_libdir/libosmotrau.so +%_libdir/pkgconfig/libosmotrau.pc + +%changelog diff --git a/osmo-talloc.diff b/osmo-talloc.diff new file mode 100644 index 0000000..3501688 --- /dev/null +++ b/osmo-talloc.diff @@ -0,0 +1,39 @@ +From 6eda430372edbf4dcebb9181ae7ef9f4daff544e Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 17 Feb 2013 21:18:44 +0100 +Subject: [PATCH] build: link to talloc + +The source files use talloc, so link to talloc. +--- + configure.ac | 1 + + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b4014a..08abd19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,6 +34,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) + PKG_CHECK_MODULES(ORTP, ortp >= 0.13.1) ++PKG_CHECK_MODULES([TALLOC], [talloc]) + + AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 01f0913..55e9122 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ TRAU_LIBVERSION=0:0:0 + INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) +-COMMONLIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) ++COMMONLIBS = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) + + lib_LTLIBRARIES = libosmoabis.la libosmotrau.la + +-- +1.7.10.4 + diff --git a/osmo-version.diff b/osmo-version.diff new file mode 100644 index 0000000..9e1f2cc --- /dev/null +++ b/osmo-version.diff @@ -0,0 +1,23 @@ +From 6cd9d765a7fcd87f483578ba2b973b879723083b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 17 Feb 2013 21:53:34 +0100 +Subject: [PATCH] build: set version + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 08abd19..a69ff8a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([libosmo-abis], +- m4_esyscmd([./git-version-gen .tarball-version]), ++ [0.1.5], + [openbsc@lists.osmocom.org]) + + AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) +-- +1.7.10.4 +