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

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Wed May 20 08:50:18 UTC 2020


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

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

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



diff --git a/.gitignore b/.gitignore
index bcd6847..ece4ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,5 @@
 doc/manuals/osmomsc-usermanual.xml
 doc/manuals/common
 doc/manuals/build
+
+contrib/osmo-msc.spec
diff --git a/configure.ac b/configure.ac
index 984c627..1e0740e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,4 +267,5 @@
     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
similarity index 94%
rename from contrib/osmo-msc.spec
rename to contrib/osmo-msc.spec.in
index 55fa4f9..1ebe9fa 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 @@
 %install
 %make_install
 
+%if 0%{?suse_version}
 %preun
 %service_del_preun %{name}.service
 
@@ -97,6 +97,7 @@
 
 %post
 %service_add_post %{name}.service
+%endif
 
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: If5499e11d872e629a018fc77d5adf5d0cb863d48
Gerrit-Change-Number: 18301
Gerrit-PatchSet: 3
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/0600f138/attachment.htm>


More information about the gerrit-log mailing list