Change in osmo-pcap[master]: contrib: integrate RPM spec

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/18303 )

Change subject: contrib: integrate RPM spec
......................................................................

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
---
M .gitignore
M configure.ac
R contrib/osmo-pcap.spec.in
3 files changed, 10 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/.gitignore b/.gitignore
index 882ef61..dd48c7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 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 @@
     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
similarity index 94%
rename from contrib/osmo-pcap.spec
rename to 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:  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(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 @@
 %install
 %make_install
 
+%if 0%{?suse_version}
 %preun
 %service_del_preun osmo-pcap-client.service osmo-pcap-server.service
 
@@ -64,6 +66,7 @@
 
 %post
 %service_add_post osmo-pcap-client.service osmo-pcap-server.service
+%endif
 
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/18303
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I7ac5f2c6bf11d88a3ebbc2f17d963d26f0b7de13
Gerrit-Change-Number: 18303
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200520/2a05ee1c/attachment.htm>