From 2cac989664857c198e0b73b42dc5c3985ac5216a Mon Sep 17 00:00:00 2001
From: rderooy <robert.de.rooy@gmail.com>
Date: Sun, 27 Sep 2020 21:27:59 +0200
Subject: [PATCH] Move appdata.xml to metainfo.xml as the former is deprecated.

Part of getting things ready for flatpak support
---
 Makefile.am                                               | 4 ++--
 contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml             | 8 ++++----
 contrib/linux/com.dosbox_x.DOSBox-X.yaml                  | 4 ++--
 .../{dosbox-x.appdata.xml.in => dosbox-x.metainfo.xml.in} | 0
 contrib/linux/dosbox-x.spec.in                            | 2 +-
 make-flatpak-sdl2.sh                                      | 4 ++--
 make-flatpak.sh                                           | 4 ++--
 make-rpm.sh.in                                            | 2 +-
 update-build-timestamp.pl                                 | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename contrib/linux/{dosbox-x.appdata.xml.in => dosbox-x.metainfo.xml.in} (100%)

diff --git a/Makefile.am b/Makefile.am
index 62e110018..8ec600344 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ install: src/dosbox-x
 	mkdir -p $(DESTDIR)$(prefix)/share/applications
 	install -m 644 contrib/linux/dosbox-x.desktop $(DESTDIR)$(prefix)/share/applications
 	mkdir -p $(DESTDIR)$(prefix)/share/metainfo
-	install -m 644 contrib/linux/dosbox-x.appdata.xml $(DESTDIR)$(prefix)/share/metainfo
+	install -m 644 contrib/linux/dosbox-x.metainfo.xml $(DESTDIR)$(prefix)/share/metainfo
 	-test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
 
 install_strip: src/dosbox-x install
@@ -94,5 +94,5 @@ uninstall:
 	rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/dosbox-x.png
 	rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/dosbox-x.svg
 	rm -f $(DESTDIR)$(prefix)/share/applications/dosbox-x.desktop
-	rm -f $(DESTDIR)$(prefix)/share/metainfo/dosbox-x.appdata.xml
+	rm -f $(DESTDIR)$(prefix)/share/metainfo/dosbox-x.metainfo.xml
 
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml b/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
index 0208c4224..dee9e8242 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
+++ b/contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
@@ -76,7 +76,7 @@ modules:
       - type: file
         path: ../icons/dosbox-x.svg
       - type: file
-        path: dosbox-x.appdata.xml
+        path: dosbox-x.metainfo.xml
       - type: file
         path: dosbox-x.desktop
     buildsystem: simple
@@ -87,9 +87,9 @@ modules:
       - install -D src/dosbox-x /app/bin/dosbox-x-sdl2
 #      - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission
       - install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
-      - install -Dm644 dosbox-x.appdata.xml /app/share/metainfo/${FLATPAK_ID}.appdata.xml
-      - sed -i 's/<id>com.dosbox_x.DOSBox-X</<id>com.dosbox_x.DOSBox-X-sdl2</' /app/share/metainfo/${FLATPAK_ID}.appdata.xml
-      - sed -i 's/<name>DOSBox-X</<name>DOSBox-X SDL2</' /app/share/metainfo/${FLATPAK_ID}.appdata.xml
+      - install -Dm644 dosbox-x.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - sed -i 's/<id>com.dosbox_x.DOSBox-X</<id>com.dosbox_x.DOSBox-X-sdl2</' /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - sed -i 's/<name>DOSBox-X</<name>DOSBox-X SDL2</' /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
       - install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop
       - sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X-sdl2/ /app/share/applications/${FLATPAK_ID}.desktop
       - sed -i 's/Name=.*/Name=DOSBox-X SDL2/' /app/share/applications/${FLATPAK_ID}.desktop
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.yaml b/contrib/linux/com.dosbox_x.DOSBox-X.yaml
index 3c793073b..55dff53f6 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X.yaml
+++ b/contrib/linux/com.dosbox_x.DOSBox-X.yaml
@@ -76,7 +76,7 @@ modules:
       - type: file
         path: ../icons/dosbox-x.svg
       - type: file
-        path: dosbox-x.appdata.xml
+        path: dosbox-x.metainfo.xml
       - type: file
         path: dosbox-x.desktop
     buildsystem: simple
@@ -89,6 +89,6 @@ modules:
       - install -D src/dosbox-x /app/bin/dosbox-x
 #      - setcap cap_net_raw+ep /app/bin/dosbox-x # fails due to needing root permission
       - install -Dm644 dosbox-x.svg /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg
-      - install -Dm644 dosbox-x.appdata.xml /app/share/metainfo/${FLATPAK_ID}.appdata.xml
+      - install -Dm644 dosbox-x.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml
       - install -Dm644 dosbox-x.desktop /app/share/applications/${FLATPAK_ID}.desktop
       - sed -i s/Icon=.*/Icon=com.dosbox_x.DOSBox-X/ /app/share/applications/${FLATPAK_ID}.desktop
diff --git a/contrib/linux/dosbox-x.appdata.xml.in b/contrib/linux/dosbox-x.metainfo.xml.in
similarity index 100%
rename from contrib/linux/dosbox-x.appdata.xml.in
rename to contrib/linux/dosbox-x.metainfo.xml.in
diff --git a/contrib/linux/dosbox-x.spec.in b/contrib/linux/dosbox-x.spec.in
index 2a4347118..454402c0a 100644
--- a/contrib/linux/dosbox-x.spec.in
+++ b/contrib/linux/dosbox-x.spec.in
@@ -14,7 +14,7 @@ Group: Applications/Emulators
 Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz
 Source1: dosbox-x.desktop
 Source2: dosbox-x.svg
-Source3: dosbox-x.appdata.xml
+Source3: dosbox-x.metainfo.xml
 
 %description
 DOSBox-X is a cross-platform DOS emulator based on DOSBox.
diff --git a/make-flatpak-sdl2.sh b/make-flatpak-sdl2.sh
index a9443141a..3d1d1d5a0 100755
--- a/make-flatpak-sdl2.sh
+++ b/make-flatpak-sdl2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# flatpak build will fail immediately if it cannot find the appdata.xml file
-# But we have a dosbox-x.appdata.xml.in file that first needs processing by autotools
+# flatpak build will fail immediately if it cannot find the metainfo.xml file
+# But we have a dosbox-x.metainfo.xml.in file that first needs processing by autotools
 ./autogen.sh
 ./configure
 
diff --git a/make-flatpak.sh b/make-flatpak.sh
index 48de0cfd1..fc3788805 100755
--- a/make-flatpak.sh
+++ b/make-flatpak.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# flatpak build will fail immediately if it cannot find the appdata.xml file
-# But we have a dosbox-x.appdata.xml.in file that first needs processing by autotools
+# flatpak build will fail immediately if it cannot find the metainfo.xml file
+# But we have a dosbox-x.metainfo.xml.in file that first needs processing by autotools
 ./autogen.sh
 ./configure
 
diff --git a/make-rpm.sh.in b/make-rpm.sh.in
index d72b38916..910f5fe4f 100755
--- a/make-rpm.sh.in
+++ b/make-rpm.sh.in
@@ -26,7 +26,7 @@ tar="../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.xz"
 tar -cvJf "$tar" --exclude=\*.git --exclude=\*.tar.xz --exclude=\*.a --exclude=\*.la --exclude=\*.Po --exclude=\*.o -C .. dosbox-x || exit 1
 cp -vf "$tar" ~/rpmbuild/SOURCES/ || exit 1
 cp -vf contrib/linux/dosbox-x.desktop ~/rpmbuild/SOURCES/ || exit 1
-cp -vf contrib/linux/dosbox-x.appdata.xml ~/rpmbuild/SOURCES/ || exit 1
+cp -vf contrib/linux/dosbox-x.metainfo.xml ~/rpmbuild/SOURCES/ || exit 1
 cp -vf contrib/icons/dosbox-x.svg ~/rpmbuild/SOURCES/ || exit 1
 rpmbuild -bb contrib/linux/dosbox-x.spec || exit 1
 rm -v "$tar" || exit 1
diff --git a/update-build-timestamp.pl b/update-build-timestamp.pl
index 07310ae99..b55353683 100755
--- a/update-build-timestamp.pl
+++ b/update-build-timestamp.pl
@@ -26,7 +26,7 @@ close(X);
 use strict;
 use warnings;
 
-my $file = "contrib/linux/dosbox-x.appdata.xml.in";
+my $file = "contrib/linux/dosbox-x.metainfo.xml.in";
 open FILE, $file or die "Can't read from $file!\n";
 
 my @lines;