[gnome-sudoku/gnome-3-16: 10/14] Switch from appdata-tools to appstream-utils

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6a69e68e49870879d32316bf0a2f67b081031c79
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Nov 24 19:03:50 2014 -0600

    Switch from appdata-tools to appstream-utils

 configure.ac                     |    3 ++-
 data/Makefile.am                 |   15 ++++++++-------
 data/gnome-sudoku.appdata.xml.in |    1 +
 3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1a3e573..48f597a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,8 @@ LT_INIT
 
 GLIB_GSETTINGS
 
+APPSTREAM_XML
+
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl ###########################################################################
@@ -44,7 +46,6 @@ PKG_CHECK_MODULES(LIBSUDOKU, [
 
 AC_SUBST([GLIB_REQUIRED])
 
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
 AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
 
 AC_CHECK_LIB([m],[floor])
diff --git a/data/Makefile.am b/data/Makefile.am
index c98b65a..0092f00 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,9 +8,9 @@ desktop_in_files = gnome-sudoku.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = gnome-sudoku.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = gnome-sudoku.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
 pixmapdir = $(datadir)/gnome-sudoku/images/
@@ -27,16 +27,17 @@ man_MANS = gnome-sudoku.6
 EXTRA_DIST = \
        $(pixmap_DATA)  \
        $(desktop_in_files) \
-       $(appdata_in_files)     \
+       $(appstream_in_files)   \
        $(gsettings_SCHEMAS) \
        $(man_MANS)
 
 CLEANFILES = \
-       $(appdata_DATA) \
+       $(appstream_XML) \
        $(desktop_DATA)
 
-check-local: $(appdata_DATA) $(desktop_DATA)
-       $(APPDATA_VALIDATE) $(appdata_DATA)
+check-local: $(desktop_DATA)
        $(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-check
+
 -include $(top_srcdir)/git.mk
diff --git a/data/gnome-sudoku.appdata.xml.in b/data/gnome-sudoku.appdata.xml.in
index b260038..ad78296 100644
--- a/data/gnome-sudoku.appdata.xml.in
+++ b/data/gnome-sudoku.appdata.xml.in
@@ -5,6 +5,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
   <_name>GNOME Sudoku</_name>
+  <_summary>Test your logic skills in this number grid puzzle</_summary>
   <description>
     <_p>
       Play the popular Japanese logic game. GNOME Sudoku is a must-install for