[gnome-software] build: Install appstream metadata to /usr/share/metainfo/



commit a69e5df5f6d3209988a2a3f577c467645ab1dd08
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon May 15 11:42:08 2017 -0400

    build: Install appstream metadata to /usr/share/metainfo/
    
    This location has been recommended since appstream 0.9.4 a year ago
    https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782661

 contrib/gnome-software.spec.in |   12 ++++++------
 data/appdata/meson.build       |    2 +-
 plugins/epiphany/meson.build   |    2 +-
 plugins/flatpak/meson.build    |    2 +-
 plugins/fwupd/meson.build      |    2 +-
 plugins/odrs/meson.build       |    2 +-
 plugins/snap/meson.build       |    2 +-
 plugins/steam/meson.build      |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 37fb972..42872f3 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -146,16 +146,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/applications/org.gnome.Software.desktop
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
-%{_datadir}/appdata/*.appdata.xml
+%{_datadir}/metainfo/*.appdata.xml
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
-%{_datadir}/appdata/org.gnome.Software.Plugin.Epiphany.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Flatpak.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Fwupd.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Odrs.metainfo.xml
-%{_datadir}/appdata/org.gnome.Software.Plugin.Steam.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Epiphany.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Software.Plugin.Steam.metainfo.xml
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so
 %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 0eecab8..b3e908b 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -4,5 +4,5 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/plugins/epiphany/meson.build b/plugins/epiphany/meson.build
index 72868f0..d793e60 100644
--- a/plugins/epiphany/meson.build
+++ b/plugins/epiphany/meson.build
@@ -22,7 +22,7 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
 if get_option('enable-tests')
diff --git a/plugins/flatpak/meson.build b/plugins/flatpak/meson.build
index e26f316..be6e3e2 100644
--- a/plugins/flatpak/meson.build
+++ b/plugins/flatpak/meson.build
@@ -27,7 +27,7 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
 if get_option('enable-tests')
diff --git a/plugins/fwupd/meson.build b/plugins/fwupd/meson.build
index 7e41471..40969fc 100644
--- a/plugins/fwupd/meson.build
+++ b/plugins/fwupd/meson.build
@@ -21,7 +21,7 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
 if get_option('enable-tests')
diff --git a/plugins/odrs/meson.build b/plugins/odrs/meson.build
index 1043681..28de57a 100644
--- a/plugins/odrs/meson.build
+++ b/plugins/odrs/meson.build
@@ -20,5 +20,5 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/plugins/snap/meson.build b/plugins/snap/meson.build
index e771269..d8b62e7 100644
--- a/plugins/snap/meson.build
+++ b/plugins/snap/meson.build
@@ -22,5 +22,5 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/plugins/steam/meson.build b/plugins/steam/meson.build
index f606870..cd62186 100644
--- a/plugins/steam/meson.build
+++ b/plugins/steam/meson.build
@@ -20,5 +20,5 @@ i18n.merge_file(
   type: 'xml',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]