From 3347d922272c0be98978b3660fdf79f6930a0ec8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Apr 11 2019 12:04:56 +0000
Subject: Fix cockpit console AppStream data


 * Add missing <?xml> header
 * Update <extends> to renamed cockpit ID, as "cockpit.desktop" is
   invalid (§ 2.1.3 [1]) and got changed in [2]
 * Avoid dashes in <id> (§2.1.3) and use the actual project's home page.
   Rename the file accordingly.
 * Use a more verbose description from the home page ("style-invalid"
   validation error)
 * Avoid whitespace in <summary>
 * Add homepage URL
 * Add <update_contact>

`appstream-util validate src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml`
is happy now.

[1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Metadata-GenericComponent
[2] https://github.com/cockpit-project/cockpit/pull/11557

---

diff --git a/Makefile.am b/Makefile.am
index 86425da..4d027e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -753,7 +753,7 @@ install-data-hook:
 	mkdir -p $(DESTDIR)$(cockpitdir)
 	rsync -rupE src/cockpit/389-console/cockpit_dist/ $(DESTDIR)$(cockpitdir)
 	mkdir -p $(DESTDIR)$(metainfodir)
-	rsync -up src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml $(DESTDIR)$(metainfodir)/org.cockpit-project.389-console.metainfo.xml
+	rsync -up src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml $(DESTDIR)$(metainfodir)/org.port389.cockpit_console.metainfo.xml
 
 if ENABLE_PERL
 sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 934e945..fc92c2b 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -815,7 +815,7 @@ exit 0
 %{_sbindir}/dscontainer
 
 %files -n cockpit-389-ds -f cockpit.list
-%{_datarootdir}/metainfo/389-console/org.cockpit-project.389-console.metainfo.xml
+%{_datarootdir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml
 %doc README.md
 
 %changelog
diff --git a/src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml b/src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml
deleted file mode 100644
index 0432d39..0000000
--- a/src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component type="addon">
-  <id>org.cockpit-project.389-console</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>389 Directory Server</name>
-  <summary>
-    389 Directory Server Management
-  </summary>
-  <description>
-    <p>
-      389 Directory Server Management
-    </p>
-  </description>
-  <extends>cockpit.desktop</extends>
-  <launchable type="cockpit-manifest">cockpit-389-console</launchable>
-</component>
diff --git a/src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml b/src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml
new file mode 100644
index 0000000..4d83343
--- /dev/null
+++ b/src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>org.port389.cockpit_console</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>389 Directory Server</name>
+  <summary>389 Directory Server Management</summary>
+  <description>
+    <p>
+      389 Directory Server is a highly usable, fully featured, reliable and
+      secure LDAP server implementation. It handles many of the largest LDAP
+      deployments in the world.
+    </p>
+  </description>
+  <extends>org.cockpit_project.cockpit</extends>
+  <launchable type="cockpit-manifest">cockpit-389-console</launchable>
+  <url type="homepage">https://www.port389.org/</url>
+  <update_contact>389-devel_AT_lists.fedoraproject.org</update_contact>
+</component>