Accepting request 401902 from GNOME:Next

- Update to version 0.5.16:
  + Add yast2-branding-openSUSE if an app depends on yast2.
  + trivial: post release version bump.
  + Fix g_ptr_array_sort use.
  + Do not rename a category ID in AsApp.
  + Never allow NULL to be added to AsApp string array.
  + Allow setting the id prefix and origin using a symlink file
    name.
  + trivial: Do not load Flatpak repos when searching.
  + Correctly detect new AppStream applications in new directories.
  + Add elementary to list of project groups.
  + trivial: Fix make distcheck.
  + trivial: Fix several issues to ensure changed signal are sent.
  + Load metainfo files if present.
  + Release version 0.5.16.
- Drop
  0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch:
  fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/401902
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2016-06-14 14:06:55 +00:00 committed by Git OBS Bridge
parent 1b96bfb78e
commit 25f4125456
8 changed files with 33 additions and 42 deletions

View File

@ -1,32 +0,0 @@
From 81d941cb916a07988fa382617402ccd2b359c7bb Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 17 Mar 2015 15:05:34 +0100
Subject: [PATCH] Add yast2-branding-openSUSE if an app depends on yast2
---
libappstream-builder/asb-task.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libappstream-builder/asb-task.c b/libappstream-builder/asb-task.c
index cc681e2..411af5a 100644
--- a/libappstream-builder/asb-task.c
+++ b/libappstream-builder/asb-task.c
@@ -196,6 +196,15 @@ asb_task_explode_extra_packages (AsbTask *task, GError **error)
GINT_TO_POINTER (1));
g_ptr_array_add (icon_themes,
g_strdup ("oxygen-icon-theme"));
+ /* Applications depending on yast2 have an implicit dependency
+ * on yast2-branding-openSUSE, which brings required icons in this case.
+ */
+ } else if (g_strcmp0 (tmp, "yast2-branding-openSUSE") == 0 ||
+ g_strcmp0 (tmp, "yast2") == 0) {
+ g_hash_table_insert (hash, g_strdup ("yast2-branding-openSUSE"),
+ GINT_TO_POINTER (1));
+ g_ptr_array_add (icon_themes,
+ g_strdup ("yast2-branding-openSUSE"));
} else {
g_ptr_array_add (array, g_strdup (tmp));
}
--
2.3.1

View File

@ -2,9 +2,9 @@
<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.5.15</param>
<param name="versionformat">0.5.16</param>
<param name="changesgenerate">enable</param>
<param name="revision">refs/tags/appstream_glib_0_5_15</param>
<param name="revision">refs/tags/appstream_glib_0_5_16</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

View File

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

View File

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

View File

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

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Jun 14 09:37:28 UTC 2016 - dimstar@opensuse.org
- Update to version 0.5.16:
+ Add yast2-branding-openSUSE if an app depends on yast2.
+ trivial: post release version bump.
+ Fix g_ptr_array_sort use.
+ Do not rename a category ID in AsApp.
+ Never allow NULL to be added to AsApp string array.
+ Allow setting the id prefix and origin using a symlink file
name.
+ trivial: Do not load Flatpak repos when searching.
+ Correctly detect new AppStream applications in new directories.
+ Add elementary to list of project groups.
+ trivial: Fix make distcheck.
+ trivial: Fix several issues to ensure changed signal are sent.
+ Load metainfo files if present.
+ Release version 0.5.16.
- Drop
0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch:
fixed upstream.
-------------------------------------------------------------------
Mon May 23 11:50:12 UTC 2016 - dimstar@opensuse.org

View File

@ -20,7 +20,7 @@
%define _build_from_vcs 1
Name: appstream-glib
Version: 0.5.15
Version: 0.5.16
Release: 0
Summary: AppStream Abstraction Library
License: LGPL-2.1+
@ -29,8 +29,6 @@ Url: http://people.freedesktop.org/~hughsient/appstream-glib/
#Source: http://people.freedesktop.org/~hughsient/appstream-glib/releases/%{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz
Source1: openSUSE-appstream-process
# PATCH-FEATURE-OPENSUSE 0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch dimstar@opensuse.org -- Add yast2-branding-openSUSE if an app depends on yast2
Patch0: 0001-Add-yast2-branding-openSUSE-if-an-app-depends-on-yas.patch
%if %{_build_from_vcs}
BuildRequires: gnome-common
%else
@ -167,7 +165,6 @@ for the repositories to be published
%prep
%setup -q
%patch0 -p1
%build
%if %{_build_from_vcs}

View File

@ -52,3 +52,7 @@ fi
# off to a mirror to catch the file, improving performance
read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-icons.tar.gz)
mv ${DEST}/appdata-icons.tar.gz ${DEST}/appdata-icons-${md5}.tar.gz
# also rename the appdata.xml.gz file in the same style
read md5 fn_catchall <<<$(md5sum ${DEST}/appdata.xml.gz)
mv ${DEST}/appdata.xml.gz ${DEST}/appdata-${md5}.xml.gz