From d4c29105a8020d74aeba8009281c4eba39e40cfd Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 3 Dec 2022 13:55:52 +0200
Subject: [PATCH 33/33] Metainfo: Fix release tag format

- Place <release> with <releases> ... </releases>
- Never create release tag with no date set

See osdn #46168

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 bootstrap/generate_metainfo.sh                | 4 +++-
 bootstrap/org.freeciv.gtk3.metainfo.xml.in    | 4 +++-
 bootstrap/org.freeciv.gtk322.metainfo.xml.in  | 4 +++-
 bootstrap/org.freeciv.gtk4.metainfo.xml.in    | 4 +++-
 bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in | 4 +++-
 bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in | 4 +++-
 bootstrap/org.freeciv.mp.qt.metainfo.xml.in   | 4 +++-
 bootstrap/org.freeciv.qt.metainfo.xml.in      | 4 +++-
 bootstrap/org.freeciv.ruledit.metainfo.xml.in | 4 +++-
 bootstrap/org.freeciv.sdl2.metainfo.xml.in    | 4 +++-
 bootstrap/org.freeciv.server.metainfo.xml.in  | 4 +++-
 11 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/bootstrap/generate_metainfo.sh b/bootstrap/generate_metainfo.sh
index 4506c25cb7..91496cddf9 100755
--- a/bootstrap/generate_metainfo.sh
+++ b/bootstrap/generate_metainfo.sh
@@ -34,7 +34,9 @@ RELTYPE="$3"
 if test "$4" != "" ; then
   RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" date=\"$4\" />"
 else
-  RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" />"
+  # Tag with no date set not set for now.
+  # RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" />"
+  RELEASETAG=""
 fi
 
 sed -e "s,\[release\],${RELEASETAG}," "${1}.in" > "${BDIR}/${1}"
diff --git a/bootstrap/org.freeciv.gtk3.metainfo.xml.in b/bootstrap/org.freeciv.gtk3.metainfo.xml.in
index 7a4e92e48e..a8ecaae055 100644
--- a/bootstrap/org.freeciv.gtk3.metainfo.xml.in
+++ b/bootstrap/org.freeciv.gtk3.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.gtk322.metainfo.xml.in b/bootstrap/org.freeciv.gtk322.metainfo.xml.in
index 965935e730..34d6ff9e27 100644
--- a/bootstrap/org.freeciv.gtk322.metainfo.xml.in
+++ b/bootstrap/org.freeciv.gtk322.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.gtk4.metainfo.xml.in b/bootstrap/org.freeciv.gtk4.metainfo.xml.in
index b1dfc0e18f..66ebbb1c11 100644
--- a/bootstrap/org.freeciv.gtk4.metainfo.xml.in
+++ b/bootstrap/org.freeciv.gtk4.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in b/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in
index 6122d00457..23bfb74fbe 100644
--- a/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in
+++ b/bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in b/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in
index c7919308c2..3257348022 100644
--- a/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in
+++ b/bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.mp.qt.metainfo.xml.in b/bootstrap/org.freeciv.mp.qt.metainfo.xml.in
index a32d550cc5..cc43fd34e5 100644
--- a/bootstrap/org.freeciv.mp.qt.metainfo.xml.in
+++ b/bootstrap/org.freeciv.mp.qt.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.qt.metainfo.xml.in b/bootstrap/org.freeciv.qt.metainfo.xml.in
index f935a1744a..730092bdf5 100644
--- a/bootstrap/org.freeciv.qt.metainfo.xml.in
+++ b/bootstrap/org.freeciv.qt.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.ruledit.metainfo.xml.in b/bootstrap/org.freeciv.ruledit.metainfo.xml.in
index 8047891f85..e3a12c29e5 100644
--- a/bootstrap/org.freeciv.ruledit.metainfo.xml.in
+++ b/bootstrap/org.freeciv.ruledit.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.sdl2.metainfo.xml.in b/bootstrap/org.freeciv.sdl2.metainfo.xml.in
index 858b3a85ae..e838309ebb 100644
--- a/bootstrap/org.freeciv.sdl2.metainfo.xml.in
+++ b/bootstrap/org.freeciv.sdl2.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
diff --git a/bootstrap/org.freeciv.server.metainfo.xml.in b/bootstrap/org.freeciv.server.metainfo.xml.in
index 4f7edadbbf..59249f5448 100644
--- a/bootstrap/org.freeciv.server.metainfo.xml.in
+++ b/bootstrap/org.freeciv.server.metainfo.xml.in
@@ -28,7 +28,9 @@
     <url type="contribute">https://www.freeciv.org/wiki/How_to_Contribute</url>
     -->
 
-    [release]
+    <releases>
+      [release]
+    </releases>
 
     <screenshots>
       <screenshot type="default">
-- 
2.35.1