Accepting request 425616 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/425616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appstream-glib?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2016-09-09 08:18:29 +00:00 committed by Git OBS Bridge
parent 26b2fff17f
commit 8af93f4b9a
8 changed files with 187 additions and 9 deletions

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.17</param>
<param name="versionformat">0.6.2</param>
<param name="changesgenerate">enable</param>
<param name="revision">refs/tags/appstream_glib_0_5_17</param>
<param name="revision">refs/tags/appstream_glib_0.6.2</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">7f0946df15140bb67074d430d50fb55a1dfa9f65</param></service></servicedata>
<param name="changesrevision">b05f647c162e809f18261e8cdca40c031be2dbb6</param></service></servicedata>

View File

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

View File

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

34
appstream-glib-lang.patch Normal file
View File

@ -0,0 +1,34 @@
From bbc53c914bcb04970b1b34079783d541f71c65a8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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

View File

@ -1,3 +1,142 @@
-------------------------------------------------------------------
Thu Sep 8 07:59:12 UTC 2016 - dimstar@opensuse.org
- Update openSUSE-appstream-process:
+ Do not include -failed.xml.gz: people complain about the
additional ~ 100KB zypp downloads on a repodata refresh at 'no
value for them'. The failed.xml.gz is not needed for regular
operations, but was a great help for packagers to find out why
their app was vetoed. They will need to find different ways to
get this info.
+ Rename appdata-screenshots.tar to appdata-screenshots-$HASH.tar
to help mirrorbrain offload this file to mirrors.
-------------------------------------------------------------------
Mon Sep 5 14:24:27 UTC 2016 - dimstar@opensuse.org
- Add appstream-glib-lang.patch: Add -lang package as a dependency
in order to properly detect translations.
-------------------------------------------------------------------
Mon Sep 05 13:49:29 UTC 2016 - dimstar@opensuse.org
- Update to version 0.6.2:
+ New Features:
- Add a hash function specifically designed for unique-ids.
- Add AS_BUNDLE_KIND_CABINET.
- Remove the inf parsing from appstream-glib.
+ Bugfixes:
- Check if icon name is unset before checking the prefix.
- Do not merge all LangPack entries.
- Do not require an icon from LOCALIZATION kind.
- Do not use the deprecated GNOME_COMPILE_WARNINGS.
- Do not use the prefix check when parsing YAML.
- Fix gcc shift warnings on 32 bit platforms.
- Ignore system datadirs that are actually per-user.
- Invalidate the unique-id if any of the parts are changed.
- Make upgrade check for SPDX license string.
- Pay attention to errors from libyaml
(gh#hughsie/appstream-glib#129).
-------------------------------------------------------------------
Tue Aug 16 13:43:47 UTC 2016 - dimstar@opensuse.org
- Update to version 0.6.1:
+ trivial: post release version bump.
+ Add Sugar as a valid desktop environment
(gh#highsie/appstream-glib#118).
+ Do not save the 'X-' prefixed keys to the AppStream metadata.
+ correct issue in transifex link
(gh#hughsie/appstream-glib#119).
+ trivial: Factor out a soon-to-be-shared function.
+ trivial: Add two more renamed desktop IDs.
+ Add two new GCC warnings and fix up signed/unsigned issues.
+ Be more careful choosing warning flags.
+ trivial: Fix some gtk-doc markup.
+ Add AsReview.
+ trivial: Remove AsReview.karma as it's implementation specific.
+ trivial: Update git.mk to latest upstream copy.
+ Port away from intltool.
+ Do not split up the main AudioVideo category.
+ Don't change ABI when built with/without gperf
(gh#hughsie/appstream-glib#123).
+ Avoid unsatisfiable development dependency when built without
libgcab (gh#hughsie/appstream-glib#122).
+ trivial: Post branch version bump.
+ Remove specific support for flatpak.
+ trivial: Fix some gtk-doc markup.
+ trivial: Add AS_BUNDLE_KIND_SNAP.
+ trivial: Add AS_BUNDLE_KIND_PACKAGE.
+ Add as_app_equal().
+ Add as_app_set_branch().
+ Include the architecture in the equality check.
+ Include the origin in the equality check.
+ Include the scope in the equality check.
+ Include the distribution system in the equality check.
+ trivial: Fix the origin name when using the symlink name.
+ trivial: Fix the flatpak scope when using the symlink name.
+ trivial: Show the unique ID when using 'appstream-util search'.
+ Add as_store_get_app_by_unique_id().
+ Enable globbing in as_app_equal().
+ Restrict addons to the same scope and bundle kind.
+ Include the version in the equality check.
+ Add as_utils_unique_id_build().
+ Allow multiple components with the same AppStream ID in the
AsStore.
+ trivial: Don't write invalid width and height properties.
+ trivial: Add some initial self tests for
AS_STORE_ADD_FLAG_USE_UNIQUE_ID.
+ Skip DEP-11 tests when DEP-11 is not enabled.
+ as_store_from_file_internal: don't redundantly monitor files.
+ as_store_from_file_internal: set up path data for the file
itself.
+ Use an array of application objects in the ID hash.
+ trivial: Use the unique ID in the dedupe logs.
+ trivial: Fix critical warning when parsing qm files without a
domain.
+ Add support for Google .PAK file to extract the <lang> data for
apps.
+ Always use wildcards when adding apps to the store.
+ Add a fast as_utils_unique_id_equal() to compare IDs for
equality.
+ Add as_utils_unique_id_valid() and use it before parsing.
+ trivial: Fix as_utils_unique_id_equal() to work with multiple
globs.
+ Support merge components.
+ Use a more relaxed unique-id match for merge components.
+ Add some more validation checks for keywords.
+ trivial: Use the existing quirk as it can be made useful again.
+ trivial: Parse the unique_id correctly when searching.
+ trivial: Check if the flatpak ID is valid before using.
+ Only subsume a safe subset from merge components.
+ trivial: Update to latest translations from transifex.
+ trivial: Switch from Transifex to Zanata.
+ trivial: Decompress .pak files when getting languages.
+ Don't include the version in the unique ID.
+ Don't include the architecture in the unique ID.
+ Allow subsuming each property individually.
+ Add SUSE-Public-Domain to License map
(gh#hughsie/appstream-glib#126).
+ Add the TRANSLATE URL kind.
+ trivial: Fix some gtk-doc markup.
+ No validation failure for lots of releases.
+ trivial: Be a bit more helpful when reporting validation
warnings.
+ trivial: Fix the comment text for 'help' when upgrading.
+ Print max caption length when validating.
+ trivial: Allow setting the output trusted mode using an
environment variable.
+ trivial: Don't add a duplicate <developer_name> when it exists
already.
+ Ensure predictable output order of XML attributes.
+ Support AppStream merge components.
+ Add support for application suggestions.
+ Make asglib read current component-type names.
+ yaml: Read all component types, not just desktop-apps.
+ Add console-app component type.
+ trivial: Fix validation of console-application components.
+ Release version 0.6.1.
-------------------------------------------------------------------
Thu Jul 14 09:47:41 UTC 2016 - zaitor@opensuse.org

View File

@ -20,15 +20,16 @@
%define _build_from_vcs 1
Name: appstream-glib
Version: 0.5.17
Version: 0.6.2
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
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
@ -165,6 +166,7 @@ for the repositories to be published
%prep
%setup -q
%patch0 -p1
%build
%if %{_build_from_vcs}

View File

@ -11,7 +11,6 @@ TMPDIR=$(mktemp -d)
/usr/bin/appstream-builder \
--enable-hidpi \
--include-failed \
--temp-dir=${TMPDIR}/apb \
--cache-dir=${TMPDIR}/apb/cache \
--origin=appdata \
@ -56,3 +55,7 @@ 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
# And the same for the -screenshots tarball (containing auto-generated screenshots for fonts)
read md5 fn_catchall <<<$(md5sum ${DEST}/appdata-screenshots.tar)
mv ${DEST}/appdata-screenshots.tar ${DEST}/appdata-screenshots-${md5}.tar