Accepting request 294762 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/294762
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appstream-glib?expand=0&rev=14

_service

@@ -2,9 +2,10 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/hughsie/appstream-glib.git</param>
     <param name="scm">git</param>
-    <param name="versionformat">0.3.6</param>
+    <param name="versionformat">0.3.6+git.%cd</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">refs/tags/appstream_glib_0_3_6</param>
+<!--
+    <param name="revision">refs/tags/appstream_glib_0_3_6</param> -->
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://github.com/hughsie/appstream-glib.git</param>
-          <param name="changesrevision">076326ae9418f0c9068dfab5816198af087bf519</param></service></servicedata>
+          <param name="changesrevision">d2ad5d3c2f29a1e4ba4a64fdb9d445dc5f415bd1</param></service></servicedata>

appstream-glib-0.3.6+git.20150407.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bd35cdf067fe1388f133ed0199e42c2c914e9f5d4008a55f3fe0a8ee25a5ae0
+size 2141704

appstream-glib-0.3.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c63660b4b67746bc4a89d97c912c38aaf8974524dfe3b5de858d1636b78a905
-size 2142292

appstream-glib-cairo-link.patch

@@ -1,24 +0,0 @@
-commit 69d58c2a969ee8d98ef458683a658a6cbec0e5b7
-Author: Dominique Leuenberger <dimstar@opensuse.org>
-Date:   Mon Mar 30 17:03:46 2015 +0200
-
-    Build: link libasb_plugin_font.la with GTK3
-    
-    Until f630bcf, linking GDKPIXBUF implicitly also linked against gtk+-3.0
-    libappstream-builder itself is linked against the whole stack, but when linking
-    using -Wl,--as-needed, the library references to cairo and gdk are dropped for
-    not being used. Hence, let's explicitly link the font-plugin against GTK.
-
-diff --git a/libappstream-builder/plugins/Makefile.am b/libappstream-builder/plugins/Makefile.am
-index 695bebc..71bc44b 100644
---- a/libappstream-builder/plugins/Makefile.am
-+++ b/libappstream-builder/plugins/Makefile.am
-@@ -125,7 +125,7 @@ libasb_plugin_ibus_xml_la_LDFLAGS = -module -avoid-version
- libasb_plugin_ibus_xml_la_CFLAGS = $(GLIB_CFLAGS) $(WARNINGFLAGS_C)
- 
- libasb_plugin_font_la_SOURCES = asb-plugin-font.c
--libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS)
-+libasb_plugin_font_la_LIBADD = $(GLIB_LIBS) $(FREETYPE_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS)
- libasb_plugin_font_la_LDFLAGS = -module -avoid-version
- libasb_plugin_font_la_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(WARNINGFLAGS_C)
- 

appstream-glib.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Apr  7 11:20:30 UTC 2015 - dimstar@opensuse.org
+
+- Move openSUSE-appstream-process definition from
+  libzypp-plugin-appdata to appstream-glib: as appstream-glib
+  provides the actual code, it's much easier to update the
+  openSUSE-appstream-process script in the same package.
+
+-------------------------------------------------------------------
+Tue Apr 07 07:55:56 UTC 2015 - dimstar@opensuse.org
+
+- Update to version 0.3.6+git.20150407:
+  + trivial: post release version bump.
+  + Build: link libasb_plugin_font.la with GTK3.
+  + Allow using as_node_get_localized_unwrap() on unwrapped
+    description markup.
+  + Remove --extra-appstream from the builder.
+  + No longer set PaddedIcon.
+  + trivial: Remove some unused code.
+  + Add a mirror-screenshots command to appstream-util
+  + Remove all networking support when building metadata.
+  + Remove the extra screenshots and appdata options from the
+    builder.
+  + Remove the batch output option from the builder.
+  + Do not strip out the source screenshot when using
+    mirror-screenshots --nonet.
+- Drop appstream-glib-cairo-link.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Mar 30 14:15:04 UTC 2015 - opensuse-packaging@opensuse.org
 

appstream-glib.spec

@@ -20,17 +20,16 @@
 %define _build_from_vcs 1
 
 Name:           appstream-glib
-Version:        0.3.6
+Version:        0.3.6+git.20150407
 Release:        0
 Summary:        AppStream Abstraction Library
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://people.freedesktop.org/~hughsient/appstream-glib/
 #Source:         http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
-Source:         %{name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
+Source1:        openSUSE-appstream-process
 Patch0:         0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch
-# PATCH-FIX-UPSTREAM appstream-glib-cairo-link.patch dimstar@opensuse.org -- Link the font plugin to GTK3
-Patch1:         appstream-glib-cairo-link.patch
 %if %{_build_from_vcs}
 BuildRequires:  gnome-common
 %else
@@ -148,12 +147,22 @@ What this library allows you to do:
 * Get screenshot image data and release announcements
 * Easily retrieve the best application data for the current locale
 * Efficiently interface with more heavy-weight parsers like expat
+
+%package -n openSUSE-appstream-process
+Summary:        Appstream processor employed by kiwi
+Group:          System
+Requires:       appstream-glib >= %{version}
+Requires:       openSUSE-appdata-extra
+
+%description -n openSUSE-appstream-process
+A wrapper around appstream-builder, called by kiwi in order to produce AppStream metadata
+for the repositories to be published
+
 %lang_package
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %if %{_build_from_vcs}
@@ -170,6 +179,11 @@ make %{?_smp_mflags}
 # We don't care for 'installed tests'; that's used by GNOME Smoke Testing.
 rm %{buildroot}%{_datadir}/installed-tests/appstream-glib/*.test
 find %{buildroot} -type f -name "*.la" -delete -print
+
+# install the appstream process script to be used by kiwi
+install -d -m 0755 %{_buildroot}%{_bindir}
+install -m 0755 -D %{S:1} %{buildroot}%{_bindir}/$(basename %{S:1})
+
 %find_lang %{name}
 
 %check
@@ -236,4 +250,8 @@ fi
 %files lang -f %{name}.lang
 %defattr(-,root,root)
 
+%files -n openSUSE-appstream-process
+%defattr(-,root,root)
+%{_bindir}/openSUSE-appstream-process
+
 %changelog

openSUSE-appstream-process

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+SRC=$1
+DEST=$2
+URL=https://static.opensuse.org/appstream/tumbleweed
+
+/usr/bin/appstream-builder \
+  --enable-hidpi					\
+  --include-failed					\
+  --temp-dir=/tmp/apb					\
+  --cache-dir=/tmp/apb/cache				\
+  --origin=appdata					\
+  --api-version=0.8					\
+  --basename=appdata					\
+  --packages-dir=${SRC}					\
+  --output-dir=${DEST}
+
+# Change screenshot URLs to our own infrastructure; disabled, as infra not ready
+# appstream-util mirror-screenshots 	\
+#   ${DEST}/appdata.xml.gz 		\
+#   ${URL} 				\
+#   /usr/share/app-screenshots		\
+#   /tmp/apb-screenshots
+
+/usr/bin/appstream-util 	\
+  status-html			\
+  ${DEST}/appdata.xml.gz 	\
+  ${DEST}/appdata.html
+
+/usr/bin/appstream-util 	\
+  status-html			\
+  ${DEST}/appdata-failed.xml.gz \
+  ${DEST}/appdata-failed.html
+