From 700a5a384cba5c75ccf1bd4dfec93f3abc449cef Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 14 May 2020 11:39:37 +0200 Subject: [PATCH] contrib: integrate RPM spec Remove OpenSUSE bug report link, set version to @VERSION@, make it build with CentOS 8 etc. Related: OS#4550 Change-Id: I4b87cb0d80bda7bbfda600310aee24a814f97f3f --- .gitignore | 2 ++ configure.ac | 1 + contrib/{osmo-bsc.spec => osmo-bsc.spec.in} | 12 ++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) rename contrib/{osmo-bsc.spec => osmo-bsc.spec.in} (96%) diff --git a/.gitignore b/.gitignore index ea828b6f1..c7b14bff3 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,5 @@ doc/manuals/generated/ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build + +contrib/osmo-bsc.spec diff --git a/configure.ac b/configure.ac index 06a00fedd..d96dfb261 100644 --- a/configure.ac +++ b/configure.ac @@ -254,4 +254,5 @@ AC_OUTPUT( doc/manuals/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/osmo-bsc.spec Makefile) diff --git a/contrib/osmo-bsc.spec b/contrib/osmo-bsc.spec.in similarity index 96% rename from contrib/osmo-bsc.spec rename to contrib/osmo-bsc.spec.in index 1aa4baf9a..20367a0bf 100644 --- a/contrib/osmo-bsc.spec +++ b/contrib/osmo-bsc.spec.in @@ -12,26 +12,24 @@ # 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/ -# - ## Disable LTO for now since it breaks compilation of the tests ## https://osmocom.org/issues/4113 %define _lto_cflags %{nil} - Name: osmo-bsc -Version: 1.6.0.78 +Version: @VERSION@ Release: 0 Summary: OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks License: AGPL-3.0-or-later AND GPL-2.0-or-later Group: Hardware/Mobile -URL: https://osmocom.org/projects/openbsc/wiki/Osmo-bsc +URL: https://osmocom.org/projects/osmobsc Source: %{name}-%{version}.tar.xz BuildRequires: automake >= 1.9 BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 +%if 0%{?suse_version} BuildRequires: systemd-rpm-macros +%endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.5.0 BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 @@ -100,6 +98,7 @@ make %{?_smp_mflags} %install %make_install +%if 0%{?suse_version} %preun %service_del_preun %{name}.service @@ -111,6 +110,7 @@ make %{?_smp_mflags} %post %service_add_post %{name}.service +%endif %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)