aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2020-05-14 11:50:15 +0200
committerOliver Smith <osmith@sysmocom.de>2020-05-19 15:37:24 +0200
commitfd387ecec3265143e766a5383d0d6db9d9f9c8d9 (patch)
tree02a208f8b5e99a2e3cf69a73c1dc51ea534c8e5e
parent9d5fadcc7907ac36be0172bfca1785d797071f77 (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: I7ac5f2c6bf11d88a3ebbc2f17d963d26f0b7de13
-rw-r--r--.gitignore2
-rw-r--r--configure.ac1
-rw-r--r--contrib/osmo-pcap.spec.in (renamed from contrib/osmo-pcap.spec)11
3 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 882ef61..dd48c7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ tests/atconfig
tests/package.m4
tests/testsuite
tests/testsuite.log
+
+contrib/osmo-pcap.spec
diff --git a/configure.ac b/configure.ac
index 2511b37..111d477 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,7 @@ AC_OUTPUT(
src/Makefile
contrib/Makefile
contrib/systemd/Makefile
+ contrib/osmo-pcap.spec
doc/Makefile
doc/examples/Makefile
tests/Makefile
diff --git a/contrib/osmo-pcap.spec b/contrib/osmo-pcap.spec.in
index 9cbafbe..2755afa 100644
--- a/contrib/osmo-pcap.spec
+++ b/contrib/osmo-pcap.spec.in
@@ -12,11 +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/
-#
-
Name: osmo-pcap
-Version: 0.1.2.0
+Version: @VERSION@
Release: 0
Summary: Osmocom's PCAP client and server
License: AGPL-3.0-or-later AND GPL-2.0-or-later
@@ -27,6 +24,9 @@ BuildRequires: autoconf
BuildRequires: automake >= 1.6
BuildRequires: libpcap-devel
BuildRequires: libtool
+%if 0%{?suse_version}
+BuildRequires: systemd-rpm-macros
+%endif
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libosmocore) >= 0.11.0
@@ -34,6 +34,7 @@ BuildRequires: pkgconfig(libosmogb)
BuildRequires: pkgconfig(libosmogsm) >= 0.11.0
BuildRequires: pkgconfig(libosmovty) >= 0.11.0
BuildRequires: pkgconfig(libzmq) >= 3.2.2
+%{?systemd_requires}
%description
Osmocom tools to help with pcap tracing.
@@ -53,6 +54,7 @@ make %{?_smp_mflags}
%install
%make_install
+%if 0%{?suse_version}
%preun
%service_del_preun osmo-pcap-client.service osmo-pcap-server.service
@@ -64,6 +66,7 @@ make %{?_smp_mflags}
%post
%service_add_post osmo-pcap-client.service osmo-pcap-server.service
+%endif
%check
make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)