[gnome-taquin] Port to appstream-util

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 18c30357bdd2ba36203ef7800a8fc4d432cf7861
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Nov 24 18:11:49 2014 -0600

    Port to appstream-util

 configure.ac                     |    3 ++-
 data/Makefile.am                 |   15 ++++++++-------
 data/gnome-taquin.appdata.xml.in |    2 ++
 data/gnome-taquin.desktop.in     |    2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e465e0f..d35c750 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
 
 GLIB_GSETTINGS
 
+APPSTREAM_XML
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
@@ -25,7 +27,6 @@ PKG_CHECK_MODULES(GNOME_TAQUIN, [
   librsvg-2.0 >= $RSVG_REQUIRED
 ])
 
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
 AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 9a50f67..001df01 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,9 +14,9 @@ desktop_in_files = gnome-taquin.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_in_files = gnome-taquin.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = gnome-taquin.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.taquin.gschema.xml
@@ -25,17 +25,18 @@ gsettings_SCHEMAS = org.gnome.taquin.gschema.xml
 man_MANS = gnome-taquin.6
 
 EXTRA_DIST = \
-       $(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/gnome-taquin.appdata.xml.in b/data/gnome-taquin.appdata.xml.in
index 0c999f6..ca6f56c 100644
--- a/data/gnome-taquin.appdata.xml.in
+++ b/data/gnome-taquin.appdata.xml.in
@@ -4,6 +4,8 @@
   <id type="desktop">gnome-taquin.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and CC-BY-SA-2.0 and CC-BY-SA-3.0</project_license>
+  <_name>GNOME Taquin</_name>
+  <_summary>Slide tiles to their correct place</_summary>
   <description>
     <_p>
       Taquin is a computer version of the 15-puzzle and other sliding puzzles.
diff --git a/data/gnome-taquin.desktop.in b/data/gnome-taquin.desktop.in
index cbd16ac..8af55c1 100644
--- a/data/gnome-taquin.desktop.in
+++ b/data/gnome-taquin.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=gnome-taquin
 _Name=Taquin
-_Comment=Slide tiles on their correct place.
+_Comment=Slide tiles on their correct place
 _Keywords=puzzle;
 Exec=gnome-taquin
 Terminal=false