PR#50324: Fix cockpit console AppStream data - 389-ds-base

Martin Pitt • 5 years ago

3347d92

Makefile.am

file modified

+1 -1

		`@@ -753,7 +753,7 @@`
		`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 \`

rpm/389-ds-base.spec.in

file modified

+1 -1

		`@@ -815,7 +815,7 @@`
		`%{_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`

src/cockpit/389-console/org.port389.cockpit_console.metainfo.xml ~~src/cockpit/389-console/org.cockpit-project.389-console.metainfo.xml~~

file renamed

+9 -6

		`@@ -1,15 +1,18 @@`
		`+ <?xml version="1.0" encoding="UTF-8"?>`
		`<component type="addon">`
		`- <id>org.cockpit-project.389-console</id>`
		`+ <id>org.port389.cockpit_console</id>`
		`<metadata_license>CC0-1.0</metadata_license>`
		`<name>389 Directory Server</name>`
		`- <summary>`
		`- 389 Directory Server Management`
		`- </summary>`
		`+ <summary>389 Directory Server Management</summary>`
		`<description>`
		`<p>`
		`- 389 Directory Server Management`
		`+ 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>cockpit.desktop</extends>`
		`+ <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>`

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.