diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2020-05-14 11:49:00 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-05-20 08:50:18 +0000 |
| commit | 0314593aa7f987bb04e31481d4c230608db7d694 (patch) | |
| tree | 6099b73ab806fe3db14493fd60aeaab548aa5faa | |
| parent | 3694631c1ac029199a7b6afd7cf1a963c7947de9 (diff) | |
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: If5499e11d872e629a018fc77d5adf5d0cb863d48
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | contrib/osmo-msc.spec.in (renamed from contrib/osmo-msc.spec) | 13 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index bcd684787..ece4ee704 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ doc/manuals/generated/ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build + +contrib/osmo-msc.spec diff --git a/configure.ac b/configure.ac index 984c6275a..1e0740e8f 100644 --- a/configure.ac +++ b/configure.ac @@ -267,4 +267,5 @@ AC_OUTPUT( doc/sequence_charts/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/osmo-msc.spec Makefile) diff --git a/contrib/osmo-msc.spec b/contrib/osmo-msc.spec.in index 55fa4f9ba..1ebe9fa7d 100644 --- a/contrib/osmo-msc.spec +++ b/contrib/osmo-msc.spec.in @@ -12,27 +12,26 @@ # 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/4115 %define _lto_cflags %{nil} - %define with_iu 1 Name: osmo-msc -Version: 1.6.1.32 +Version: @VERSION@ Release: 0 Summary: Osmocom's MSC for 2G and 3G circuit-switched mobile networks License: AGPL-3.0-or-later AND GPL-2.0-only Group: Productivity/Telephony/Servers -URL: https://osmocom.org/projects/osmomsc/wiki +URL: https://osmocom.org/projects/osmomsc Source: %{name}-%{version}.tar.xz BuildRequires: autoconf BuildRequires: automake BuildRequires: libdbi-drivers-dbd-sqlite3 BuildRequires: libtool +%if 0%{?suse_version} +BuildRequires: systemd-rpm-macros +%endif BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(dbi) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 @@ -86,6 +85,7 @@ make %{?_smp_mflags} %install %make_install +%if 0%{?suse_version} %preun %service_del_preun %{name}.service @@ -97,6 +97,7 @@ make %{?_smp_mflags} %post %service_add_post %{name}.service +%endif %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) |