Switch from appdata-tools to appstream-utils

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])

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

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