From ad0e12a4ebb7172e6607d425d45893b1bd09fb08 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Mon, 11 Feb 2019 16:01:47 +0100
Subject: [PATCH] Fix and validate AppStream metainfo

 - Add missing XML header
 - Validate format as per documentation:
   https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/#_app_data_validate_usage
---
 Dockerfile.buildrpm                    | 2 +-
 cockpit-composer.spec.in               | 2 ++
 io.weldr.cockpit-composer.metainfo.xml | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.buildrpm b/Dockerfile.buildrpm
index 54cebd81a..25e6022fc 100644
--- a/Dockerfile.buildrpm
+++ b/Dockerfile.buildrpm
@@ -4,7 +4,7 @@ LABEL maintainer="Xiaofeng Wang" \
       baseimage="Fedora:latest" \
       description="A cockpit-composer RPM builder container running on Fedora"
 
-RUN dnf install -y make cmake rpm-build which gnupg tar xz curl jq nodejs python gcc gcc-c++ && dnf clean all
+RUN dnf install -y make cmake rpm-build which gnupg tar xz curl jq nodejs python gcc gcc-c++ libappstream-glib && dnf clean all
 
 WORKDIR /welder
 CMD ["make", "rpm", "srpm"]
diff --git a/cockpit-composer.spec.in b/cockpit-composer.spec.in
index 3f1c3784a..3ae7e3d93 100644
--- a/cockpit-composer.spec.in
+++ b/cockpit-composer.spec.in
@@ -8,6 +8,7 @@ URL:            http://weldr.io/
 Source0:        https://github.com/weldr/welder-web/releases/download/%{version}/cockpit-composer-%{version}.tar.gz
 
 BuildArch:      noarch
+BuildRequires:  libappstream-glib
 
 Requires:       cockpit
 Requires:       lorax-composer
@@ -25,6 +26,7 @@ Composer GUI for Cockpit and lorax-composer
 mkdir -p %{buildroot}/%{_datadir}/cockpit/welder
 cp -r public/dist/* %{buildroot}/%{_datadir}/cockpit/welder
 mkdir -p %{buildroot}/%{_datadir}/metainfo/
+appstream-util validate-relax --nonet io.weldr.cockpit-composer.metainfo.xml
 cp io.weldr.cockpit-composer.metainfo.xml %{buildroot}/%{_datadir}/metainfo/
 
 %files
diff --git a/io.weldr.cockpit-composer.metainfo.xml b/io.weldr.cockpit-composer.metainfo.xml
index f988a238f..45b2acbf3 100644
--- a/io.weldr.cockpit-composer.metainfo.xml
+++ b/io.weldr.cockpit-composer.metainfo.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>io.weldr.cockpit-composer</id>
   <metadata_license>CC0-1.0</metadata_license>