From 7485ec1a5084822548be4776e5ce2343a942a828 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 27 Mar 2023 16:57:21 +0300
Subject: [PATCH 47/47] Metainfo: Fix syntax of the generated metainfo

- Do not pass NEWS URL as the DATE when latter is missing
- Correct syntax when DATE given, but no NEWS URL

See osdn #47706

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 bootstrap/Makefile.am          | 2 +-
 bootstrap/generate_metainfo.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am
index ed10130220..1134bb5d6b 100644
--- a/bootstrap/Makefile.am
+++ b/bootstrap/Makefile.am
@@ -103,7 +103,7 @@ langstat_ruledit.txt:
 
 $(metainfofile_DATA) : %.metainfo.xml: %.metainfo.xml.in generate_metainfo.sh $(top_srcdir)/fc_version
 	@if ! $(AM_V_P) ; then echo "  metainfo $@" ; fi
-	$(AM_V_at) "$(top_srcdir)/bootstrap/generate_metainfo.sh" "$@" "$(top_builddir)/bootstrap" "@RELEASE_TYPE@" @RELEASE_DATE@ @NEWS_URL@
+	$(AM_V_at) "$(top_srcdir)/bootstrap/generate_metainfo.sh" "$@" "$(top_builddir)/bootstrap" "@RELEASE_TYPE@" "@RELEASE_DATE@" "@NEWS_URL@"
 
 metainfo_stamp: $(metainfofile_DATA)
 
diff --git a/bootstrap/generate_metainfo.sh b/bootstrap/generate_metainfo.sh
index 8841a8eb32..b2231aed84 100755
--- a/bootstrap/generate_metainfo.sh
+++ b/bootstrap/generate_metainfo.sh
@@ -35,7 +35,7 @@ if test "$4" != "" ; then
   if test "$5" != "" ; then
     RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" date=\"$4\"><url>$5</url></release>"
   else
-    RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" date=\"$4\" \>"
+    RELEASETAG="<release version=\"${FCVER}\" type=\"${RELTYPE}\" date=\"$4\" />"
   fi
 else
   # Tag with no date causes format checker warning, but
-- 
2.39.2