[four-in-a-row] Switch from appdata-tools to appstream-util

[Michael Catanzaro <mcatanzaro src gnome org>]

commit fc3f1343378097e8059c15e4c8767c04afc9a877
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Nov 24 18:52:59 2014 -0600

    Switch from appdata-tools to appstream-util

 configure.ac                      |    3 ++-
 data/Makefile.am                  |   15 ++++++++-------
 data/four-in-a-row.appdata.xml.in |    2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3a58a73..161d7a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,8 @@ AM_PROG_CC_C_O
 
 GLIB_GSETTINGS
 
+APPSTREAM_XML
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
@@ -26,7 +28,6 @@ PKG_CHECK_MODULES(FOUR_IN_A_ROW, [
   libcanberra-gtk3 >= $CANBERRA_GTK_REQUIRED
 ])
 
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
 AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
 
 AC_PATH_PROG([GTESTER], [gtester])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7176972..be7758c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,9 +27,9 @@ desktop_in_files = four-in-a-row.desktop.in
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = four-in-a-row.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = four-in-a-row.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
 man_MANS     = four-in-a-row.6
@@ -37,17 +37,18 @@ man_MANS     = four-in-a-row.6
 EXTRA_DIST = $(ui_DATA) \
              $(pixmap_DATA) \
              $(sounds_DATA) \
-             $(appdata_in_files) \
+             $(appstream_in_files) \
              $(desktop_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/four-in-a-row.appdata.xml.in b/data/four-in-a-row.appdata.xml.in
index 006e06a..fb81a41 100644
--- a/data/four-in-a-row.appdata.xml.in
+++ b/data/four-in-a-row.appdata.xml.in
@@ -4,6 +4,8 @@
  <id type="desktop">four-in-a-row.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+ and GPL-3.0+ and CC-BY-SA-3.0</project_license>
+ <_name>Four-in-a-row</_name>
+ <_summary>Make lines of the same color to win</_summary>
  <description>
   <_p>
    A family classic, the objective of Four-in-a-row is to build a line of four