reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / nodemanager.spec

diff --git a/nodemanager.spec b/nodemanager.spec
index 99feae6..e4ef6db 100644 (file)
--- a/nodemanager.spec
+++ b/nodemanager.spec
@@ -1,8 +1,8 @@
 %define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name nodemanager-lib
-%define version 5.2
-%define taglevel 19
+%define version 7.0
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -44,7 +44,12 @@ Requires: python3
 # connecting PLC
 Requires: python3-pycurl
 # Signed tickets
+# see myplc/plc.d/gpg for more details on the gnupg / gpg topic
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 31
+Requires: gnupg1
+%else
 Requires: gnupg
+%endif
 # sioc/plnet
 Requires: pyplnet >= 4.3
 # we do need the slice images in any case
@@ -210,6 +215,15 @@ nodemanager-vs provides the vserver code for the PlanetLab Node Manager.
 
 ##############################
 %changelog
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - nodemanager-7.0-0
+- ported to python3
+- add a systemd dependency to network-online so the service won't start too early
+- only support systemd, removed init-oriented business
+- also removed debian-oriented business
+
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - nodemanager-5.2-20
+- simply make conf_files.py executable, so that bootmanager can be py2/py3 compliant
+
 * Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-19
 - tweak to run against libvirt-python-1.3.3 under f24
 - fix by Thomas Dreibholz - misspelled ovs-ovsctl