From 6370f5dd6f05ce7bb95f2811a70b06462f321b72 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 14 May 2020 11:27:08 +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: I59255889740195ec811a947a7130ae0918ea4b4d --- .gitignore | 2 ++ configure.ac | 3 ++- contrib/{libosmocore.spec => libosmocore.spec.in} | 12 +++--------- 3 files changed, 7 insertions(+), 10 deletions(-) rename contrib/{libosmocore.spec => libosmocore.spec.in} (98%) diff --git a/.gitignore b/.gitignore index 52242339e..a9dd30399 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ tests/conv/gsm0503_test_vectors.c # code coverage reports libosmocore-*-coverage* coverage-cobertura.xml + +contrib/libosmocore.spec diff --git a/configure.ac b/configure.ac index ac887a0db..f69c78de3 100644 --- a/configure.ac +++ b/configure.ac @@ -441,4 +441,5 @@ AC_OUTPUT( Doxyfile.coding Doxyfile.gb Doxyfile.ctrl - Makefile) + Makefile + contrib/libosmocore.spec) diff --git a/contrib/libosmocore.spec b/contrib/libosmocore.spec.in similarity index 98% rename from contrib/libosmocore.spec rename to contrib/libosmocore.spec.in index 1ea7a8e19..a5af3e9b7 100644 --- a/contrib/libosmocore.spec +++ b/contrib/libosmocore.spec.in @@ -12,14 +12,8 @@ # 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/ -# - - -%define version_unconverted 1.3.0.94 - Name: libosmocore -Version: 1.3.0.94 +Version: @VERSION@ Release: 0 Summary: The Open Source Mobile Communications Core Library License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later @@ -30,7 +24,7 @@ BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 -BuildRequires: python2 +BuildRequires: python3 BuildRequires: xz BuildRequires: pkgconfig(gnutls) >= 2.12.0 BuildRequires: pkgconfig(libpcsclite) @@ -294,7 +288,7 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version Requires: libosmousb0 = %version -Requires: libusb-1_0-devel +Requires: pkgconfig(libusb-1.0) %description -n libosmousb-devel The libosmosub library in particular contains routines for USB device