From 42c56c5082f7b94632529ae3e4924827c36ac77ae8c0a3cf50b49d2d1f03fb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 11 Sep 2016 13:59:23 +0000 Subject: [PATCH] Accepting request 426831 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/426831 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=82 --- _service | 4 ++-- _servicedata | 2 +- appstream-glib-0.6.2.tar.xz | 3 --- appstream-glib-0.6.3.tar.xz | 3 +++ appstream-glib-lang.patch | 34 ---------------------------------- appstream-glib.changes | 20 ++++++++++++++++++++ appstream-glib.spec | 5 +---- 7 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 appstream-glib-0.6.2.tar.xz create mode 100644 appstream-glib-0.6.3.tar.xz delete mode 100644 appstream-glib-lang.patch diff --git a/_service b/_service index 5a9fbda..7afa3d1 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ https://github.com/hughsie/appstream-glib.git git - 0.6.2 + 0.6.3 enable - refs/tags/appstream_glib_0.6.2 + refs/tags/appstream_glib_0_6_3 *.tar diff --git a/_servicedata b/_servicedata index 14abaa3..3078097 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hughsie/appstream-glib.git - b05f647c162e809f18261e8cdca40c031be2dbb6 \ No newline at end of file + 9745dabb0b3ca2de17e74e97aa54e181d65f76a7 \ No newline at end of file diff --git a/appstream-glib-0.6.2.tar.xz b/appstream-glib-0.6.2.tar.xz deleted file mode 100644 index 1af9863..0000000 --- a/appstream-glib-0.6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3586b48c367eca571d53f3f839225838eb81f3c86897a2d0e2a97a810e406fd1 -size 2211024 diff --git a/appstream-glib-0.6.3.tar.xz b/appstream-glib-0.6.3.tar.xz new file mode 100644 index 0000000..ee54378 --- /dev/null +++ b/appstream-glib-0.6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6727e6188cf4cde23830c862ce0e22827b38770c17d78f0fc0b05d2f28dc0da3 +size 2213776 diff --git a/appstream-glib-lang.patch b/appstream-glib-lang.patch deleted file mode 100644 index 8817ca6..0000000 --- a/appstream-glib-lang.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bbc53c914bcb04970b1b34079783d541f71c65a8 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Mon, 5 Sep 2016 15:06:19 +0200 -Subject: [PATCH] Add -lang package as a dependency in order to properly detect - translations - -In openSUSE, the -lang package is 'only' recommended, so that users CAN save the -space if they don't need them (and using bundles there is also a method to only install -one language instead of all supported ones). - -Unfortunately, with this technique, gnome-software keeps on pretending that no application -is localized in openSUSE. ---- - libappstream-builder/asb-package-rpm.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libappstream-builder/asb-package-rpm.c b/libappstream-builder/asb-package-rpm.c -index ef80584..3937535 100644 ---- a/libappstream-builder/asb-package-rpm.c -+++ b/libappstream-builder/asb-package-rpm.c -@@ -333,6 +333,10 @@ asb_package_rpm_ensure_deps (AsbPackage *pkg, GError **error) - *tmp = '\0'; - asb_package_add_dep (pkg, dep_no_qual); - } -+ /* Add the corresponding -lang package as a dependency */ -+ tmp = g_strconcat (asb_package_get_name (pkg), "-lang", NULL); -+ asb_package_add_dep (pkg, tmp); -+ g_free (tmp); - out: - rpmtdFreeData (td); - rpmtdFree (td); --- -2.9.3 - diff --git a/appstream-glib.changes b/appstream-glib.changes index dbe181d..1223a5a 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sun Sep 11 09:50:57 UTC 2016 - zaitor@opensuse.org + +- Update to version 0.6.3: + + trivial: + - Fix a -Wundef compiler warning. + - Sync example spec file with downstream. + - Do not write for unknown types. + - Fix up tests after the -lang auto-dep commit. + + Support components with merge=replace rules. + + Add a component kind of 'driver'. + + Refactor the desktop file icon loading code. + + Convert the built unknown icons to the correct kind depending + on the action. + + Add -lang package as a dependency in order to properly detect + translations (gh#hughsie/appstream-glib#135). + + Add an easy way to add a modalias to an existing file. + + Add an easy way to add a language to an existing file. +- Drop appstream-glib-lang.patch: Fixed upstream. + ------------------------------------------------------------------- Thu Sep 8 07:59:12 UTC 2016 - dimstar@opensuse.org diff --git a/appstream-glib.spec b/appstream-glib.spec index fdaa6b8..75a7251 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -20,7 +20,7 @@ %define _build_from_vcs 1 Name: appstream-glib -Version: 0.6.2 +Version: 0.6.3 Release: 0 Summary: AppStream Abstraction Library License: LGPL-2.1+ @@ -28,8 +28,6 @@ Group: System/Libraries Url: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: %{name}-%{version}.tar.xz Source1: openSUSE-appstream-process -# PATCH-FEATURE-UPSTREAM appstream-glib-lang.patch gh#hughsie/appstream-glib#135 dimstar@opensuse.org -- Add -lang packages as internal deps. This helps us to show apps as localized -Patch0: appstream-glib-lang.patch %if %{_build_from_vcs} BuildRequires: gnome-common %else @@ -166,7 +164,6 @@ for the repositories to be published %prep %setup -q -%patch0 -p1 %build %if %{_build_from_vcs}