Accepting request 428988 from GNOME:Factory
- Update openSUSE-appstream-process: do not rename the various appstream files to contain the sha hash in their filename: zypp is not (yet) able to cope with this (boo#999047). (forwarded request 428684 from dimstar) OBS-URL: https://build.opensuse.org/request/show/428988 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appstream-glib?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
8af93f4b9a
commit
02ee9bc0ec
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.6.2</param>
|
||||
<param name="versionformat">0.6.3</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0.6.2</param>
|
||||
<param name="revision">refs/tags/appstream_glib_0_6_3</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">b05f647c162e809f18261e8cdca40c031be2dbb6</param></service></servicedata>
|
||||
<param name="changesrevision">9745dabb0b3ca2de17e74e97aa54e181d65f76a7</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3586b48c367eca571d53f3f839225838eb81f3c86897a2d0e2a97a810e406fd1
|
||||
size 2211024
|
||||
3
appstream-glib-0.6.3.tar.xz
Normal file
3
appstream-glib-0.6.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6727e6188cf4cde23830c862ce0e22827b38770c17d78f0fc0b05d2f28dc0da3
|
||||
size 2213776
|
||||
@ -1,34 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 19 12:44:38 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update openSUSE-appstream-process: do not rename the various
|
||||
appstream files to contain the sha hash in their filename: zypp
|
||||
is not (yet) able to cope with this (boo#999047).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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 <icon type=unknown> 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
|
||||
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -6,6 +6,7 @@ URL=https://static.opensuse.org/appstream/tumbleweed
|
||||
# Do not produce the html files - the biggest tasks are done
|
||||
# Users interested in them can always produce them locally out of the appdata.xml.gz file
|
||||
HTMLOUT=no
|
||||
HASHED_NAMES=no
|
||||
|
||||
TMPDIR=$(mktemp -d)
|
||||
|
||||
@ -46,16 +47,19 @@ if [ "$HTMLOUT" = "yes" ]; then
|
||||
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
|
||||
|
||||
# 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
|
||||
if [ "$HASHED_NAMES" = "yes" ]; then
|
||||
# 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
|
||||
|
||||
# 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
|
||||
# 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
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user