flatpak: change "appdata" dir to "metainfo"

The specificaion for where appstream files go changed

(cherry picked from commit 598ab78572f5aafc747cd570092d0cdeaa31f85c)

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 9468dd6163cffcd0d19ea36de1e1f754910c2357..ea4d972a44010e090f306811e903cb4e4c23b8e4 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -186,7 +186,7 @@ uninstall-local:
        fi
        rm -f $(DESTDIR)/$(datadir)/applications/$(hb_menu)
        @-if test -n "$(flatpak_appdata)"; then \
-               rm -f $(DESTDIR)/$(datadir)/appdata/$(flatpak_appdata); \
+               rm -f $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
        fi
 
 install-data-local:
@@ -204,6 +204,6 @@ install-data-local:
        mkdir -p $(DESTDIR)/$(datadir)/applications/; \
        $(INSTALL_DATA) $(srcdir)/$(hb_menu) $(DESTDIR)/$(datadir)/applications/$(hb_menu)
        @-if test -n "$(flatpak_appdata)"; then \
-               mkdir -p $(DESTDIR)/$(datadir)/appdata/; \
-               $(INSTALL_DATA) $(srcdir)/$(flatpak_appdata) $(DESTDIR)/$(datadir)/appdata/$(flatpak_appdata); \
+               mkdir -p $(DESTDIR)/$(datadir)/metainfo/; \
+               $(INSTALL_DATA) $(srcdir)/$(flatpak_appdata) $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
        fi

diff --git a/test/module.defs b/test/module.defs
index 4ba41015686875bc4c07b7816e999ce4e4421ed3..bda89ad554130643740c33dfd28570d8274958da 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -43,7 +43,7 @@ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 ifeq (1,$(FEATURE.flatpak))
     TEST.appdata   = $(TEST.src/)fr.handbrake.HandBrakeCLI.appdata.xml
-    TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/appdata/$(notdir $(TEST.appdata))
+    TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/metainfo/$(notdir $(TEST.appdata))
 endif
 
 ###############################################################################