Update libappstream-glib to 0.5.7, with appstream-compose1.2

2 files changed, 5 insertions, 47 deletions

diff --git a/specs/appstream-glib-0.5.6-less-deps.patch b/specs/appstream-glib-0.5.6-less-deps.patch
deleted file mode 100644
index 469f37c..0000000
--- a/specs/appstream-glib-0.5.6-less-deps.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur appstream-glib-0.5.6/configure.ac appstream-glib-0.5.6-nogtk/configure.ac
---- appstream-glib-0.5.6/configure.ac	2015-12-16 13:36:37.000000000 +0100
-+++ appstream-glib-0.5.6-nogtk/configure.ac	2016-01-20 19:26:27.843931222 +0100
-@@ -147,13 +147,7 @@
- # builder (default enabled)
- AC_ARG_ENABLE(builder, AS_HELP_STRING([--disable-builder],[Disable AppStream builder support]), enable_builder=$enableval)
- if test x$enable_builder != xno; then
--	PKG_CHECK_MODULES(GTK, gtk+-3.0)
- 	PKG_CHECK_MODULES(SQLITE, sqlite3)
--	PKG_CHECK_MODULES(FREETYPE, pango fontconfig freetype2 >= 9.10.0)
--	AC_PATH_PROG(GCAB, [gcab], [no])
--	if test x$GCAB = "xno" ; then
--		AC_MSG_ERROR([gcab program not found])
--	fi
- 
- 	# ostree (default enabled)
- 	AC_ARG_ENABLE(ostree, AS_HELP_STRING([--disable-ostree],[Disable ostree support]), enable_ostree=$enableval)
-diff -ur appstream-glib-0.5.6/data/tests/Makefile.am appstream-glib-0.5.6-nogtk/data/tests/Makefile.am
---- appstream-glib-0.5.6/data/tests/Makefile.am	2015-10-07 17:42:05.000000000 +0200
-+++ appstream-glib-0.5.6-nogtk/data/tests/Makefile.am	2016-01-20 21:54:54.258131957 +0100
-@@ -50,7 +50,7 @@
- 	usr/share/pixmaps/test.png			\
- 	validate.xml.gz
- 
--if HAVE_BUILDER
-+if HAVE_GCAB
- colorhug-als-2.0.0.cab: $(srcdir)/firmware/2_0_0/firmware.*
- 	$(AM_V_GEN) touch -c -m -d"2000-01-01T00:00:00" $?;	\
- 	$(GCAB) --create --nopath $@			\
-diff -ur appstream-glib-0.5.6/libappstream-builder/plugins/Makefile.am appstream-glib-0.5.6-nogtk/libappstream-builder/plugins/Makefile.am
---- appstream-glib-0.5.6/libappstream-builder/plugins/Makefile.am	2015-10-07 18:38:51.000000000 +0200
-+++ appstream-glib-0.5.6-nogtk/libappstream-builder/plugins/Makefile.am	2016-01-20 21:55:32.223662233 +0100
-@@ -21,7 +21,6 @@
- 	libasb_plugin_desktop.la			\
- 	libasb_plugin_gir.la				\
- 	libasb_plugin_gresource.la			\
--	libasb_plugin_font.la				\
- 	libasb_plugin_gettext.la			\
- 	libasb_plugin_gstreamer.la			\
- 	libasb_plugin_hardcoded.la			\
diff --git a/specs/libappstream-glib.spec b/specs/libappstream-glib.spec
index 9d03910..48822e5 100644
--- a/specs/libappstream-glib.spec
+++ b/specs/libappstream-glib.spec
@@ -1,11 +1,10 @@
 Summary:   Library for AppStream metadata
 Name:      libappstream-glib
-Version:   0.5.6
+Version:   0.5.7
 Release:   1%{?dist}
 License:   LGPLv2+
 URL:       http://people.freedesktop.org/~hughsient/appstream-glib/
 Source0:   http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-%{version}.tar.xz
-Patch0:    appstream-glib-0.5.6-less-deps.patch
 BuildRequires: freedesktop-sdk-base
 BuildRequires: glib2-dev
 BuildRequires: gobject-introspection-dev
@@ -42,15 +41,13 @@ GLib headers and libraries for appstream-builder.
 
 %prep
 %setup -q -n appstream-glib-%{version}
-%patch0 -p1
 
 %build
 
-autoreconf --force --install
-
 %configure \
         --disable-gtk-doc \
         --disable-man \
+        --disable-fonts \
         --disable-firmware \
         --disable-dep11 \
         --disable-static \
@@ -64,7 +61,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %__rm -f %{buildroot}%{_libdir}/libappstream-glib*.la
 %__rm -f %{buildroot}%{_libdir}/libappstream-builder*.la
-%__rm -f %{buildroot}%{_libdir}/asb-plugins-4/*.la
+%__rm -f %{buildroot}%{_libdir}/asb-plugins-5/*.la
 
 %find_lang appstream-glib
 
@@ -79,6 +76,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/libappstream-glib.so.8*
 %{_libdir}/girepository-1.0/*.typelib
 %{_bindir}/appstream-util
+%{_bindir}/appstream-compose
 %dir %{_datadir}/bash-completion/completions/
 %{_datadir}/bash-completion/completions/appstream-util
 
@@ -98,7 +96,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc COPYING
 %{_bindir}/appstream-builder
 %{_datadir}/bash-completion/completions/appstream-builder
-%{_libdir}/asb-plugins-4/*.so
+%{_libdir}/asb-plugins-5/*.so
 %{_libdir}/libappstream-builder.so.8*
 
 %files builder-dev