Accepting request 397428 from GNOME:Next
Update to 0.5.15 - let it build first OBS-URL: https://build.opensuse.org/request/show/397428 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=73
This commit is contained in:
Bjørn Lie
Git OBS Bridge
parent
e28aade582
commit
e21a20fd86
@ -1,28 +0,0 @@
|
||||
From 0a87006dee61a79498c4d428443340afea99fd82 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Mon, 2 May 2016 15:28:47 +0200
|
||||
Subject: [PATCH] Omit timestamp from gzip compressed files
|
||||
|
||||
---
|
||||
libappstream-builder/asb-utils.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libappstream-builder/asb-utils.c b/libappstream-builder/asb-utils.c
|
||||
index c75fb43..be340b5 100644
|
||||
--- a/libappstream-builder/asb-utils.c
|
||||
+++ b/libappstream-builder/asb-utils.c
|
||||
@@ -441,8 +441,10 @@ asb_utils_write_archive (const gchar *filename,
|
||||
struct stat st;
|
||||
|
||||
a = archive_write_new ();
|
||||
- if (g_str_has_suffix (filename, ".gz"))
|
||||
+ if (g_str_has_suffix (filename, ".gz")) {
|
||||
archive_write_add_filter_gzip (a);
|
||||
+ archive_write_set_filter_option (a, "gz", "timestamp", NULL);
|
||||
+ }
|
||||
if (g_str_has_suffix (filename, ".bz2"))
|
||||
archive_write_add_filter_bzip2 (a);
|
||||
if (g_str_has_suffix (filename, ".xz"))
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From e890e51fd330f48c2671eab4004749fa85cef966 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Mon, 2 May 2016 14:57:51 +0200
|
||||
Subject: [PATCH] Sort archive contents by name for repeatable results
|
||||
|
||||
---
|
||||
libappstream-builder/asb-utils.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/libappstream-builder/asb-utils.c b/libappstream-builder/asb-utils.c
|
||||
index 616c40a..c75fb43 100644
|
||||
--- a/libappstream-builder/asb-utils.c
|
||||
+++ b/libappstream-builder/asb-utils.c
|
||||
@@ -532,6 +532,9 @@ asb_utils_write_archive_dir (const gchar *filename,
|
||||
if (files->len == 0)
|
||||
return TRUE;
|
||||
|
||||
+ /* sort by filename for deterministic results */
|
||||
+ g_ptr_array_sort (files, g_strcmp0);
|
||||
+
|
||||
/* write tar file */
|
||||
return asb_utils_write_archive (filename, directory, files, error);
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
4
_service
4
_service
@ -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.14</param>
|
||||
<param name="versionformat">0.5.15</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0_5_14</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0_5_15</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/hughsie/appstream-glib.git</param>
|
||||
<param name="changesrevision">469bd3d1a1109df0569b6d6aac3fb79bf7a5cbd6</param></service></servicedata>
|
||||
<param name="changesrevision">164491a6b552e2473fab4658933d0495dec98e44</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f3e75cf075be92ce7bf6ad2d012ab268f8f7873e1f41f711d6ca6fed7bab7e60
|
||||
size 2196340
|
||||
3
appstream-glib-0.5.15.tar.xz
Normal file
3
appstream-glib-0.5.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:788a6c022b7f364ea39fa1d095fe0b48f01dd2f557ccc2750c88d13b2cdca47f
|
||||
size 2198112
|
||||
@ -1,3 +1,45 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 23 11:50:12 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.5.15:
|
||||
+ trivial: post release version bump.
|
||||
+ Add AS_APP_QUIRK_HAS_SHORTCUT.
|
||||
+ trivial: Try to shut up libasn.
|
||||
+ Ignore files with invalid suffixes when building installed
|
||||
stores.
|
||||
+ Add AS_APP_QUIRK_NOT_LAUNCHABLE.
|
||||
+ trivial: Add three more apps to the ID fallback table.
|
||||
+ trivial: Fix a critical warning when an AppData file has
|
||||
invalid input.
|
||||
+ Fall back to the icon name for LOCAL icon types.
|
||||
+ yaml: Make icon parser spec compliant.
|
||||
+ trivial: Add a work-around for the new libreoffice in the
|
||||
builder.
|
||||
+ trivial: Set missing icon prefix for cached YAML.
|
||||
+ Sort archive contents by name for repeatable results.
|
||||
+ Omit timestamp from gzip compressed files.
|
||||
+ README.md: add note for glob usage.
|
||||
+ README.md: wrap at 80 chars.
|
||||
+ trivial: Add some more debugging to debug an issue.
|
||||
+ Rename the xdg-app support to the new name: Flatpak.
|
||||
+ trivial: Add some support for flatpak self tests.
|
||||
+ Addons can have duplcate names.
|
||||
+ Show the app name when complaining about missing description in
|
||||
the metadata.
|
||||
+ Revert "trivial: Add some support for flatpak self tests".
|
||||
+ Always add /var/lib/flatpak/appstream as a possible Flatpak
|
||||
path.
|
||||
+ Add all applications for all architectures when loading
|
||||
Flatpak.
|
||||
+ Set the architecture of discovered Flatpak apps.
|
||||
+ Correctly set the architecture on newly discovered
|
||||
applications.
|
||||
+ Save the ID prefix in more places.
|
||||
+ Release version 0.5.15.
|
||||
- Drop 0001-Omit-timestamp-from-gzip-compressed-files.patch and
|
||||
0001-Sort-archive-contents-by-name-for-repeatable-results.patch:
|
||||
fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 2 13:29:57 UTC 2016 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
%define _build_from_vcs 1
|
||||
|
||||
Name: appstream-glib
|
||||
Version: 0.5.14
|
||||
Version: 0.5.15
|
||||
Release: 0
|
||||
Summary: AppStream Abstraction Library
|
||||
License: LGPL-2.1+
|
||||
@ -31,10 +31,6 @@ 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
|
||||
# PATCH-FIX-UPSTREAM 0001-Sort-archive-contents-by-name-for-repeatable-results.patch boo#977885 stefan.bruens@rwth-aachen.de -- Sort archive contents by name for repeatable results
|
||||
Patch1: 0001-Sort-archive-contents-by-name-for-repeatable-results.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-Omit-timestamp-from-gzip-compressed-files.patch boo#977885 stefan.bruens@rwth-aachen.de -- Omit timestamp from gzip compressed files
|
||||
Patch2: 0001-Omit-timestamp-from-gzip-compressed-files.patch
|
||||
%if %{_build_from_vcs}
|
||||
BuildRequires: gnome-common
|
||||
%else
|
||||
@ -172,8 +168,6 @@ for the repositories to be published
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%if %{_build_from_vcs}
|
||||
|
||||
@ -46,3 +46,9 @@ if [ "$HTMLOUT" = "yes" ]; then
|
||||
# compress the HTML file (boo#942985)
|
||||
xz -9 ${DEST}/appdata-failed.html
|
||||
fi
|
||||
|
||||
# rename the appdata-icons.tar.gz tarball to something like
|
||||
# appdata-icons-${hash}.tar.gz, allowing mirrorbrain to send users
|
||||
# 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user