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

[laforge]

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

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: Iba04d5c7b9beee80baca83063f9cb2cd533a0003
---
M .gitignore
M configure.ac
R contrib/osmo-ggsn.spec.in
3 files changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 7dec8a9..cb27dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,5 @@
 doc/manuals/osmomsc-usermanual.xml
 doc/manuals/common
 doc/manuals/build
+
+contrib/osmo-ggsn.spec
diff --git a/configure.ac b/configure.ac
index c92a06c..e31cef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,7 @@
     doc/manuals/Makefile
                  contrib/Makefile
                  contrib/systemd/Makefile
+                 contrib/osmo-ggsn.spec
                  tests/Makefile
                  tests/lib/Makefile
                  tests/gtp/Makefile
diff --git a/contrib/osmo-ggsn.spec b/contrib/osmo-ggsn.spec.in
similarity index 94%
rename from contrib/osmo-ggsn.spec
rename to contrib/osmo-ggsn.spec.in
index 15e4144..4e8b11e 100644
--- a/contrib/osmo-ggsn.spec
+++ b/contrib/osmo-ggsn.spec.in
@@ -12,25 +12,23 @@
 # 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/4114
 %define _lto_cflags %{nil}
 
-
 Name:           osmo-ggsn
-Version:        1.5.0.31
+Version:        @VERSION@
 Release:        0
 Summary:        GPRS Support Node
 License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Productivity/Telephony/Servers
-URL:            https://osmocom.org/projects/openggsn/wiki/OsmoGGSN
+URL:            https://osmocom.org/projects/openggsn
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig >= 0.20
+%if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
+%endif
 BuildRequires:  pkgconfig(libgtpnl) >= 1.0.0
 BuildRequires:  pkgconfig(libmnl) >= 1.0.3
 BuildRequires:  pkgconfig(libosmocore) >= 1.1.0
@@ -84,6 +82,7 @@
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
+%if 0%{?suse_version}
 %pre
 %service_add_pre %{name}.service
 
@@ -95,6 +94,7 @@
 
 %postun
 %service_del_postun %{name}.service
+%endif
 
 %post   -n libgtp6 -p /sbin/ldconfig
 %postun -n libgtp6 -p /sbin/ldconfig

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

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