From 3d54f92a9092193a262d7b216c137047d2b4dcd9 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 29 Aug 2016 16:41:36 +0100 Subject: [PATCH] New upstream release --- .gitignore | 1 + ...c-shift-warnings-on-32-bit-platforms.patch | 104 ------------------ libappstream-glib.spec | 19 +++- sources | 2 +- 4 files changed, 15 insertions(+), 111 deletions(-) delete mode 100644 0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch diff --git a/.gitignore b/.gitignore index a7af6dc..528d396 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /appstream-glib-0.5.17.tar.xz /appstream-glib-0.5.18.tar.xz /appstream-glib-0.6.1.tar.xz +/appstream-glib-0.6.2.tar.xz diff --git a/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch b/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch deleted file mode 100644 index 257f610..0000000 --- a/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 1feb3abbe56661d83ee798d9ad98e49cfd525267 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Wed, 17 Aug 2016 16:04:21 +0200 -Subject: [PATCH] Fix gcc shift warnings on 32 bit platforms - -Unsure if > 32 bit enums actually work on 32 bit platforms, but let's -try and fix the shift overflow first. Fix suggested by mclasen on irc. - -as-app.h:162:44: warning: left shift count >= width of type [-Wshift-count-overflow] - AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1lu << 32, /* Since: 0.6.1 */ - ^~ -as-app.h:163:42: warning: left shift count >= width of type [-Wshift-count-overflow] - AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1lu << 33, /* Since: 0.6.1 */ - ^~ -as-app.h:164:41: warning: left shift count >= width of type [-Wshift-count-overflow] - AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1lu << 34, /* Since: 0.6.1 */ ---- - libappstream-glib/as-app.h | 70 +++++++++++++++++++++++----------------------- - 1 file changed, 35 insertions(+), 35 deletions(-) - -diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h -index 0c130fa..7a20c55 100644 ---- a/libappstream-glib/as-app.h -+++ b/libappstream-glib/as-app.h -@@ -127,41 +127,41 @@ typedef enum { - **/ - typedef enum { - AS_APP_SUBSUME_FLAG_NONE = 0, -- AS_APP_SUBSUME_FLAG_NO_OVERWRITE = 1lu << 0, /* Since: 0.1.4 */ -- AS_APP_SUBSUME_FLAG_BOTH_WAYS = 1lu << 1, /* Since: 0.1.4 */ -- AS_APP_SUBSUME_FLAG_PARTIAL = 1lu << 2, /* Since: 0.2.2 */ -- AS_APP_SUBSUME_FLAG_KIND = 1lu << 3, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_STATE = 1lu << 4, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_BUNDLES = 1lu << 5, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_TRANSLATIONS = 1lu << 6, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_RELEASES = 1lu << 7, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_KUDOS = 1lu << 8, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_CATEGORIES = 1lu << 9, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_PERMISSIONS = 1lu << 10, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_EXTENDS = 1lu << 11, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_COMPULSORY = 1lu << 12, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_SCREENSHOTS = 1lu << 13, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_REVIEWS = 1lu << 14, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_CONTENT_RATINGS = 1lu << 15, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_PROVIDES = 1lu << 16, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_ICONS = 1lu << 17, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_MIMETYPES = 1lu << 18, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_VETOS = 1lu << 19, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_LANGUAGES = 1lu << 20, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_NAME = 1lu << 21, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_COMMENT = 1lu << 22, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_DEVELOPER_NAME = 1lu << 23, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_DESCRIPTION = 1lu << 24, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_METADATA = 1lu << 25, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_URL = 1lu << 26, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_KEYWORDS = 1lu << 27, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_SOURCE_FILE = 1lu << 28, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_BRANCH = 1lu << 29, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_ORIGIN = 1lu << 30, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_METADATA_LICENSE = 1lu << 31, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1lu << 32, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1lu << 33, /* Since: 0.6.1 */ -- AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1lu << 34, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_NO_OVERWRITE = 1ull << 0, /* Since: 0.1.4 */ -+ AS_APP_SUBSUME_FLAG_BOTH_WAYS = 1ull << 1, /* Since: 0.1.4 */ -+ AS_APP_SUBSUME_FLAG_PARTIAL = 1ull << 2, /* Since: 0.2.2 */ -+ AS_APP_SUBSUME_FLAG_KIND = 1ull << 3, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_STATE = 1ull << 4, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_BUNDLES = 1ull << 5, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_TRANSLATIONS = 1ull << 6, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_RELEASES = 1ull << 7, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_KUDOS = 1ull << 8, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_CATEGORIES = 1ull << 9, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_PERMISSIONS = 1ull << 10, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_EXTENDS = 1ull << 11, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_COMPULSORY = 1ull << 12, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_SCREENSHOTS = 1ull << 13, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_REVIEWS = 1ull << 14, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_CONTENT_RATINGS = 1ull << 15, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_PROVIDES = 1ull << 16, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_ICONS = 1ull << 17, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_MIMETYPES = 1ull << 18, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_VETOS = 1ull << 19, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_LANGUAGES = 1ull << 20, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_NAME = 1ull << 21, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_COMMENT = 1ull << 22, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_DEVELOPER_NAME = 1ull << 23, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_DESCRIPTION = 1ull << 24, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_METADATA = 1ull << 25, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_URL = 1ull << 26, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_KEYWORDS = 1ull << 27, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_SOURCE_FILE = 1ull << 28, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_BRANCH = 1ull << 29, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_ORIGIN = 1ull << 30, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_METADATA_LICENSE = 1ull << 31, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1ull << 32, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1ull << 33, /* Since: 0.6.1 */ -+ AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1ull << 34, /* Since: 0.6.1 */ - /*< private >*/ - AS_APP_SUBSUME_FLAG_LAST, - } AsAppSubsumeFlags; --- -2.7.4 - diff --git a/libappstream-glib.spec b/libappstream-glib.spec index 0287238..5c6aca7 100644 --- a/libappstream-glib.spec +++ b/libappstream-glib.spec @@ -5,14 +5,12 @@ Summary: Library for AppStream metadata Name: libappstream-glib -Version: 0.6.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?dist} License: LGPLv2+ URL: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-%{version}.tar.xz -Patch0: 0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libtool BuildRequires: docbook-utils @@ -24,7 +22,6 @@ BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf_version} BuildRequires: gtk3-devel BuildRequires: gettext -BuildRequires: intltool BuildRequires: libgcab1-devel BuildRequires: libuuid-devel BuildRequires: libstemmer-devel @@ -85,7 +82,6 @@ GLib headers and libraries for appstream-builder. %prep %setup -q -n appstream-glib-%{version} -%patch0 -p1 %build %configure \ @@ -154,6 +150,17 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir %changelog +* Mon Aug 29 2016 Richard Hughes 0.6.2-1 +- New upstream release +- Add API for gnome-software +- Do not merge all LangPack entries +- Do not require an icon from LOCALIZATION kind +- Do not use the prefix check when parsing YAML +- 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 + * Wed Aug 17 2016 Kalev Lember 0.6.1-2 - Fix gcc shift warnings on 32 bit platforms diff --git a/sources b/sources index 5629403..a224caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65192dc4bd499bae9e695df99ea7d5cd appstream-glib-0.6.1.tar.xz +cffbae6071f7e33ee89fd8f1e0ae271a appstream-glib-0.6.2.tar.xz