X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeimage.spec;h=3a11bf2943a6bb0647a8c8cdcaddfcab69ef7baa;hb=88c235263724952cf1488114498efc36e0c165f8;hp=c35722f556aa45e4f28bfd03c50f5e1090c4c0a3;hpb=bdbe7fb87708305d4ddf8509f0c817dec2c35876;p=bootstrapfs.git

diff --git a/nodeimage.spec b/nodeimage.spec
index c35722f..3a11bf2 100644
--- a/nodeimage.spec
+++ b/nodeimage.spec
@@ -3,10 +3,9 @@
 
 %define name nodeimage-%{nodefamily}
 %define version 5.2
-%define taglevel 6
+%define taglevel 9
 
 # pldistro already in the rpm name
-#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
 # we don't really need the standard postinstall process from rpm that
@@ -31,7 +30,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # other archs must be able to install this
 BuildArch: noarch
 
-Requires: tar, gnupg, sharutils, bzip2
+Requires: tar, sharutils, bzip2
+# see myplc/plc.d/gpg for more details on the gnupg / gpg topic
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 31
+Requires: gnupg1
+%else
+Requires: gnupg
+%endif
+
 # this is for plc.d/packages that uses ed for hacking yumgroups.xml
 Requires: ed
 
@@ -39,7 +45,7 @@ Requires: ed
 Obsoletes: bootstrapfs-%{nodefamily}
 # 5.0 now has 3-fold nodefamily
 %define obsolete_nodefamily %{pldistro}-%{_arch}
-Obsoletes: bootstrapfs-%{obsolete_nodefamily}
+# Obsoletes: bootstrapfs-{obsolete_nodefamily}
 
 AutoReqProv: no
 %define debug_package %{nil}
@@ -155,6 +161,17 @@ rm -rf $RPM_BUILD_ROOT
 /etc/plc.d
 
 %changelog
+* Mon Jan 07 2019 Thierry <Parmentelat> - nodeimage-5.2-9
+- ok for f27 and f29
+- cleanup old distros
+
+* Sun Jul 16 2017 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-8
+- fix the fedora and fedora-updates repo definitions for f25
+- add /etc/plc.d/packages index
+
+* Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-7
+- yum config ; deprecates old fedora releases, add support for f23/f24
+
 * Fri Nov 13 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeimage-5.2-6
 - fix for f22 and dnf.conf