From c1161e237743e343327563154444c2ae1e766795 Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 00:30:29 -0500 Subject: [PATCH 1/8] Add metainfo.xml for improving package metadata --- .../package/linux/multimc.metainfo.xml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 application/package/linux/multimc.metainfo.xml diff --git a/application/package/linux/multimc.metainfo.xml b/application/package/linux/multimc.metainfo.xml new file mode 100644 index 00000000..dd1764a3 --- /dev/null +++ b/application/package/linux/multimc.metainfo.xml @@ -0,0 +1,54 @@ + + + multimc + multimc.desktop + MultiMC + Manage Minecraft instances with ease + +

Overview

+

MultiMC is a free, open source launcher for Minecraft. It allows you to have multiple, cleanly separated instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple and powerful interface.

+

Features

+
    +
  • Manage multiple instances of Minecraft at once
    • +
  • Start Minecraft with a custom resolution
    • +
  • Change Java's runtime options (including memory options)
    • +
  • Shows Minecraft's console output in a colour coded window
    • +
  • Kill Minecraft easily if it crashes / freezes
    • +
  • Custom icons and groups for instances
    • +
  • Forge integration (automatic installation, version downloads, mod management)
    • +
  • Minecraft world management
    • +
  • Import and export Minecraft instances to share them with anyone
    • +
  • Supports every version of Minecraft that the vanilla launcher does
    • +
+

NOTE: This distribution is not verified by, affiliated with, or supported by the MultiMC team.

+ + + + https://multimc.org/images/screenshots/main.png + https://multimc.org/images/screenshots/editmods.png + https://multimc.org/images/screenshots/version.png + https://multimc.org/images/screenshots/console.png + https://multimc.org/images/screenshots/settings.png + + + + + + https://multimc.org/ + https://discord.com/invite/0k2zsXGNHs0fE4Wm + https://github.com/MultiMC/MultiMC5/wiki/FAQ + https://github.com/flathub/multimc/issues + https://translate.multimc.org/ + https://www.patreon.com/multimc + The MultiMC Team + CC0-1.0 + Apache-2.0 + + mild + mild + mild + mild + mild + + joshua.gage.stone_at_gmail.com + From 399109728fa5115a682f92edff9f98c65e00301d Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 00:38:43 -0500 Subject: [PATCH 2/8] Update RPM .spec to include metainfo file --- application/package/rpm/MultiMC5.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/package/rpm/MultiMC5.spec b/application/package/rpm/MultiMC5.spec index 9dcc01b4..68aad774 100644 --- a/application/package/rpm/MultiMC5.spec +++ b/application/package/rpm/MultiMC5.spec @@ -25,16 +25,21 @@ install -m 0644 ../ubuntu/multimc/opt/multimc/icon.svg %{buildroot}/opt/multimc/ install -m 0755 ../ubuntu/multimc/opt/multimc/run.sh %{buildroot}/opt/multimc/run.sh mkdir -p %{buildroot}/%{_datadir}/applications install -m 0644 ../ubuntu/multimc/usr/share/applications/multimc.desktop %{buildroot}/%{_datadir}/applications/multimc.desktop - +mkdir -p %{buildroot}/%{_datadir}/metainfo +install -m 0644 ../linux/multimc.metainfo.xml %{buildroot}/%{_datadir}/metainfo/multimc.metainfo.xml %files %dir /opt/multimc /opt/multimc/icon.svg /opt/multimc/run.sh %{_datadir}/applications/multimc.desktop - +%{_datadir}/metainfo/multimc.metainfo.xml %changelog + +* Tue Dec 08 00:34:35 CET 2020 joshua-stone +- Add metainfo.xml for improving package metadata + * Wed Nov 25 22:53:59 CET 2020 kb1000 - Initial version of the RPM package, based on the Ubuntu package From 65990a1bf1a904f0433d9af2d26c19ced5993a2f Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 00:42:16 -0500 Subject: [PATCH 3/8] Remove disclaimer --- application/package/linux/multimc.metainfo.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/application/package/linux/multimc.metainfo.xml b/application/package/linux/multimc.metainfo.xml index dd1764a3..3e075267 100644 --- a/application/package/linux/multimc.metainfo.xml +++ b/application/package/linux/multimc.metainfo.xml @@ -20,7 +20,6 @@
  • Import and export Minecraft instances to share them with anyone
  • Supports every version of Minecraft that the vanilla launcher does
    • -

    NOTE: This distribution is not verified by, affiliated with, or supported by the MultiMC team.

    From d55030367eb0f592f83b54011157ed77bf7439fa Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 00:55:50 -0500 Subject: [PATCH 4/8] Use metainfodir macro directly --- application/package/rpm/MultiMC5.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/package/rpm/MultiMC5.spec b/application/package/rpm/MultiMC5.spec index 68aad774..79f416b9 100644 --- a/application/package/rpm/MultiMC5.spec +++ b/application/package/rpm/MultiMC5.spec @@ -25,15 +25,15 @@ install -m 0644 ../ubuntu/multimc/opt/multimc/icon.svg %{buildroot}/opt/multimc/ install -m 0755 ../ubuntu/multimc/opt/multimc/run.sh %{buildroot}/opt/multimc/run.sh mkdir -p %{buildroot}/%{_datadir}/applications install -m 0644 ../ubuntu/multimc/usr/share/applications/multimc.desktop %{buildroot}/%{_datadir}/applications/multimc.desktop -mkdir -p %{buildroot}/%{_datadir}/metainfo -install -m 0644 ../linux/multimc.metainfo.xml %{buildroot}/%{_datadir}/metainfo/multimc.metainfo.xml +mkdir -p %{buildroot}/%{_metainfodir} +install -m 0644 ../linux/multimc.metainfo.xml %{buildroot}/%{_metainfodir}/multimc.metainfo.xml %files %dir /opt/multimc /opt/multimc/icon.svg /opt/multimc/run.sh %{_datadir}/applications/multimc.desktop -%{_datadir}/metainfo/multimc.metainfo.xml +%{_metainfodir}/multimc.metainfo.xml %changelog From a9a78c74db0fef256f8e02d8cfefdec22d089f26 Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 01:13:11 -0500 Subject: [PATCH 5/8] Fix contact email --- application/package/linux/multimc.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/package/linux/multimc.metainfo.xml b/application/package/linux/multimc.metainfo.xml index 3e075267..15f7fd1d 100644 --- a/application/package/linux/multimc.metainfo.xml +++ b/application/package/linux/multimc.metainfo.xml @@ -49,5 +49,5 @@ mild mild - joshua.gage.stone_at_gmail.com + peterix_at_gmail.com From 42d124ed2b135b439b1215acc101d3eee2fbecdc Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 13:23:52 -0500 Subject: [PATCH 6/8] Move metainfo to ubuntu oflder so it can be used in both .rpm and .deb builds --- application/package/rpm/MultiMC5.spec | 2 +- .../multimc/usr/share/metainfo}/multimc.metainfo.xml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename application/package/{linux => ubuntu/multimc/usr/share/metainfo}/multimc.metainfo.xml (100%) diff --git a/application/package/rpm/MultiMC5.spec b/application/package/rpm/MultiMC5.spec index 79f416b9..5b72c781 100644 --- a/application/package/rpm/MultiMC5.spec +++ b/application/package/rpm/MultiMC5.spec @@ -26,7 +26,7 @@ install -m 0755 ../ubuntu/multimc/opt/multimc/run.sh %{buildroot}/opt/multimc/ru mkdir -p %{buildroot}/%{_datadir}/applications install -m 0644 ../ubuntu/multimc/usr/share/applications/multimc.desktop %{buildroot}/%{_datadir}/applications/multimc.desktop mkdir -p %{buildroot}/%{_metainfodir} -install -m 0644 ../linux/multimc.metainfo.xml %{buildroot}/%{_metainfodir}/multimc.metainfo.xml +install -m 0644 ../ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml %{buildroot}/%{_metainfodir}/multimc.metainfo.xml %files %dir /opt/multimc diff --git a/application/package/linux/multimc.metainfo.xml b/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml similarity index 100% rename from application/package/linux/multimc.metainfo.xml rename to application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml From e9b779aa77a28f723735a91398db1a05744074ea Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Tue, 8 Dec 2020 13:25:34 -0500 Subject: [PATCH 7/8] Update documentation WRT .rpm contents --- application/package/rpm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/package/rpm/README.md b/application/package/rpm/README.md index 98b6d5cb..0c2b1e49 100644 --- a/application/package/rpm/README.md +++ b/application/package/rpm/README.md @@ -1,7 +1,7 @@ # What is this? A simple RPM package for MultiMC that contains a script that downloads and installs real MultiMC on Red Hat based systems. -It contains a `.desktop` file, an icon, and a simple script that does the heavy lifting. +It contains a `.desktop` file, a `.metainfo.xml` file, an icon, and a simple script that does the heavy lifting. # How to build this? You need the `rpm-build` package. Switch into this directory, then run: From 331f6df9e56d6d8f5784896ea2a26f509c52b257 Mon Sep 17 00:00:00 2001 From: Joshua Stone Date: Thu, 10 Dec 2020 11:43:37 -0500 Subject: [PATCH 8/8] Improve metadata for screenshots --- .../usr/share/metainfo/multimc.metainfo.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml b/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml index 15f7fd1d..64b2f44d 100644 --- a/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml +++ b/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml @@ -23,11 +23,19 @@ - https://multimc.org/images/screenshots/main.png - https://multimc.org/images/screenshots/editmods.png - https://multimc.org/images/screenshots/version.png - https://multimc.org/images/screenshots/console.png - https://multimc.org/images/screenshots/settings.png + https://multimc.org/images/screenshots/main.png + + + https://multimc.org/images/screenshots/editmods.png + + + https://multimc.org/images/screenshots/version.png + + + https://multimc.org/images/screenshots/console.png + + + https://multimc.org/images/screenshots/settings.png