From f43830cef1ec62d4d7d3ac9d9325c6643dd1dc147bd03be2df568bcb454504ca Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Sep 2017 19:43:48 +0000 Subject: [PATCH] Accepting request 522284 from GNOME:Factory - Trim and ensure neutrality of descriptions. - Update License to "LGPL-2.1+ AND GPL-2.0+": the client tools (builder, compose and util) are licenses GPL-2.0+, the library is LGPL-2.1+. - Update to version 0.7.2: + Allow remote icon types for desktop AppData files. + Do not check the suffix of tags. + Prefer /usr/share/metainfo as default path for metainfo files. + build: Enable C99 support in meson.build. + build: Define _XOPEN_SOURCE in order to expose realpath() in headers. + libappstream-glib: Use g_ascii_strcasecmp() instead of strcasecmp(). + libappstream-builder/utils: Drop an unreachable branch. + libappstream-glib/self-test: Add some additional checks. - Update to version 0.7.1: + Validate the format according to the spec. + Add kinds for application provides. + Skip loading desktop data from Snap directory. + Update the SPDX license list to 2.6. + Support CompulsoryForDesktops in YAML. + Have plugins link with asglib along with asbuilder. + meson: avoid unnecessary gdk dependency. + meson: introspection optional. + meson: Install appdata-xml.m4. + build: Make gperf dependency fully required. + Fail to validate if AppData screenshots are duplicated. OBS-URL: https://build.opensuse.org/request/show/522284 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/appstream-glib?expand=0&rev=48 --- _service | 4 +- _servicedata | 2 +- appstream-glib-0.6.12.tar.xz | 3 - appstream-glib-0.7.2.tar.xz | 3 + appstream-glib.changes | 115 ++++++++++++++++++++++++++++++++ appstream-glib.spec | 123 ++++++++++++++--------------------- 6 files changed, 171 insertions(+), 79 deletions(-) delete mode 100644 appstream-glib-0.6.12.tar.xz create mode 100644 appstream-glib-0.7.2.tar.xz diff --git a/_service b/_service index 97a935c..e8761f5 100644 --- a/_service +++ b/_service @@ -2,9 +2,9 @@ https://github.com/hughsie/appstream-glib.git git - 0.6.12 + 0.7.2 enable - refs/tags/appstream_glib_0_6_12 + refs/tags/appstream_glib_0_7_2 *.tar diff --git a/_servicedata b/_servicedata index a25ea0e..1b4db3c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/hughsie/appstream-glib.git - ab7b5a089ce01fd90ac53bf100d143eacca73c9c \ No newline at end of file + 6149f7eb067c4d267738fd5e7ea5c0cc1be7bc5b \ No newline at end of file diff --git a/appstream-glib-0.6.12.tar.xz b/appstream-glib-0.6.12.tar.xz deleted file mode 100644 index 3ace834..0000000 --- a/appstream-glib-0.6.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fff01ac092e04fb229f979a11fa007fce366989a67b9fe46b03421c2d5bc53be -size 2230060 diff --git a/appstream-glib-0.7.2.tar.xz b/appstream-glib-0.7.2.tar.xz new file mode 100644 index 0000000..4713358 --- /dev/null +++ b/appstream-glib-0.7.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d5aba36189bc64e6aaf62282ab357ecaa61bc9f1645fa4bf21b9dc8bfc1feea +size 2227404 diff --git a/appstream-glib.changes b/appstream-glib.changes index b8960b6..b195225 100644 --- a/appstream-glib.changes +++ b/appstream-glib.changes @@ -1,3 +1,118 @@ +------------------------------------------------------------------- +Tue Sep 5 20:26:36 UTC 2017 - jengelh@inai.de + +- Trim and ensure neutrality of descriptions. + +------------------------------------------------------------------- +Mon Sep 4 10:52:58 UTC 2017 - dimstar@opensuse.org + +- Update License to "LGPL-2.1+ AND GPL-2.0+": the client tools + (builder, compose and util) are licenses GPL-2.0+, the library + is LGPL-2.1+. + +------------------------------------------------------------------- +Fri Sep 01 18:48:53 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.7.2: + + Allow remote icon types for desktop AppData files. + + Do not check the suffix of tags. + + Prefer /usr/share/metainfo as default path for metainfo files. + + build: Enable C99 support in meson.build. + + build: Define _XOPEN_SOURCE in order to expose realpath() in + headers. + + libappstream-glib: Use g_ascii_strcasecmp() instead of + strcasecmp(). + + libappstream-builder/utils: Drop an unreachable branch. + + libappstream-glib/self-test: Add some additional checks. + +------------------------------------------------------------------- +Fri Sep 01 18:48:41 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.7.1: + + Validate the format according to the spec. + + Add kinds for application provides. + + Skip loading desktop data from Snap directory. + + Update the SPDX license list to 2.6. + + Support CompulsoryForDesktops in YAML. + + Have plugins link with asglib along with asbuilder. + + meson: avoid unnecessary gdk dependency. + + meson: introspection optional. + + meson: Install appdata-xml.m4. + + build: Make gperf dependency fully required. + + Fail to validate if AppData screenshots are duplicated. + +------------------------------------------------------------------- +Mon Jun 26 06:56:38 UTC 2017 - zaitor@opensuse.org + +- Update to version 0.7.0: + + trivial: Fix a -Wpointer-sign warning. + + Switch to the meson build system. + + build: Improve build-api wrapper for Meson. + + build: Add options for building API docs and man pages. + + build: Conditionally generate man pages. + + build: Conditionally generate the API reference. + + trivial: Fix the autogenerated pkgconfig files. + + trivial: Add back the Requires and Requires.private in the .pc + files. + + Remove the cache-id functionality. + + trivial: Ensure HAVE_GCAB is set when libgcab is being used. + + Add as_store_get_apps_by_id_merge(). + + trivial: Try linking the GIR file with the local + appstream-glib. + + Show a warning if adding keywords after the keyword cache was + created. + + Fix the default plugin directory used by appstream-builder. + + Add the limits in the validation output messages. + + trivial: Prevent crash when a sanity check fails. + + trivial: Remove the ability to run threaded. + + Remove functionality processing an old metadata file. + + trivial: Fix a warning message to be more clear. + + trivial: Fix a variable with a misleading name. + + Actually return failure if the AsbTask fails. + + Add the missing shell-extension plugin. + + trivial: Remove autotools fixups no longer required. + + Do not enforce that the project_group is a valid + environment_id. + + Do not add the GNOME-Software-specific categories or icons by + default. + + Enable Travis CI for Fedora 25 and Debian Stretch. + + Allow compiling with newer versions of meson. + + trivial: Fix the meson version compare value. + + Fix regression when building component types without icons. + + as-app-builder: Don't cast gsize to guint32 when getting file + length. + + trivial: Fix an error message in news-to-appdata. + + Do not write a timestamp when using news-to-appdata. + + trivial: Ensure every app has format set before adding to + store. + + trivial: Fix up several small memory leaks. +- Add meson BuildRequires and switch autotools macros configure, + make and makeinstall to meson, meson_build and meson_install + following upstream switch to Meson build system. + +------------------------------------------------------------------- +Mon Jun 26 06:56:07 UTC 2017 - zaitor@opensuse.org + +- Update to version 0.6.13: + + Add functions for getting the AsApp search match. + + Add functions for getting the AsStore search match. + + Allow using the app origin as a search keyword. + + trivial: Use the new custom tag in the self tests. + + Add support for . + + trivial: Fix up some broken links in the generated + documentation. + + Add support for icon scaling. + + Add as_utils_guid_from_data(). + + Support non-numeric version numbers correctly. + + trivial: Do not store the .shell-extension prefix in the search + cache. + + Casefold all stemmed entries. + + trivial: Add a regex command to appstream-util for testing + firmware versions. + + Add a 'check-component' command to appstream-util. + + Add as_app_remove_category(). + + Add as_app_remove_kudo(). + ------------------------------------------------------------------- Mon Apr 24 10:51:33 UTC 2017 - dimstar@opensuse.org diff --git a/appstream-glib.spec b/appstream-glib.spec index 66363b3..b04d099 100644 --- a/appstream-glib.spec +++ b/appstream-glib.spec @@ -18,27 +18,22 @@ %define _build_from_vcs 1 - Name: appstream-glib -Version: 0.6.12 +Version: 0.7.2 Release: 0 Summary: AppStream Abstraction Library -License: LGPL-2.1+ +License: LGPL-2.1+ AND GPL-2.0+ Group: System/Libraries Url: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: %{name}-%{version}.tar.xz Source1: openSUSE-appstream-process -%if %{_build_from_vcs} -BuildRequires: gnome-common -%else -# We still need some part to build the man pages -BuildRequires: xsltproc -%endif BuildRequires: gcab >= 0.6 BuildRequires: gobject-introspection-devel BuildRequires: gperf BuildRequires: intltool >= 0.40.0 BuildRequires: libyaml-devel +BuildRequires: meson +BuildRequires: pkgconfig BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.14 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -57,14 +52,19 @@ BuildRequires: pkgconfig(uuid) Requires: gcab # Required in order to be able to convert .svg icons Requires: gdk-pixbuf-loader-rsvg -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{_build_from_vcs} +BuildRequires: gnome-common +%else +# We still need some part to build the man pages +BuildRequires: xsltproc +%endif %description -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. -What this library allows you to do: +This library allows to: * Read and write compressed AppStream XML files * Add and search for applications in an application store @@ -74,58 +74,47 @@ What this library allows you to do: %package -n libappstream-glib8 Summary: AppStream Abstraction Library +License: LGPL-2.1+ Group: System/Libraries %description -n libappstream-glib8 -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. - -What this library allows you to do: - -* Read and write compressed AppStream XML files -* Add and search for applications in an application store -* Get screenshot image data and release announcements -* Easily retrieve the best application data for the current locale -* Efficiently interface with more heavy-weight parsers like expat +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. %package -n libappstream-builder8 Summary: AppStream Abstraction Library +License: LGPL-2.1+ Group: System/Libraries %description -n libappstream-builder8 -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. - -What this library allows you to do: - -* Read and write compressed AppStream XML files -* Add and search for applications in an application store -* Get screenshot image data and release announcements -* Easily retrieve the best application data for the current locale -* Efficiently interface with more heavy-weight parsers like expat +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. %package -n typelib-1_0-AppStreamBuilder-1_0 -Summary: AppStream Abstraction Library -- Introspection bindings +Summary: Introspection bindings for the AppStream abstraction library +License: LGPL-2.1+ Group: System/Libraries %description -n typelib-1_0-AppStreamBuilder-1_0 -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. %package -n typelib-1_0-AppStreamGlib-1_0 -Summary: AppStream Abstraction Library -- Introspection bindings +Summary: Introspection bindings for the AppStream abstraction library +License: LGPL-2.1+ Group: System/Libraries %description -n typelib-1_0-AppStreamGlib-1_0 -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. %package devel -Summary: AppStream Abstraction Library -- Development files +Summary: Development files for the AppStream abstraction library +License: LGPL-2.1+ AND GPL-2.0+ Group: Development/Languages/C and C++ Requires: %{name} = %{version} Requires: libappstream-builder8 = %{version} @@ -139,11 +128,11 @@ Provides: appdata-tools = 0.1.9 Obsoletes: appdata-tools-lang < 0.1.9 %description devel -This library provides GObjects and helper methods to make it easy to read and write AppStream metadata. -It also provides a simple DOM implementation that makes it easy to edit nodes and -convert to and from the standardized XML representation. +This library provides GObjects and helper methods to read and write +AppStream metadata. It also provides a DOM implementation to edit +nodes and convert to and from the standardized XML representation. -What this library allows you to do: +This library allows to: * Read and write compressed AppStream XML files * Add and search for applications in an application store @@ -153,7 +142,8 @@ What this library allows you to do: %package -n openSUSE-appstream-process Summary: Appstream processor employed by kiwi -Group: System +License: LGPL-2.1+ AND GPL-2.0+ +Group: Development/Tools/Building Requires: appstream-glib >= %{version} Requires: openSUSE-appdata-extra @@ -167,47 +157,41 @@ for the repositories to be published %setup -q %build -%if %{_build_from_vcs} -NOCONFIGURE=1 ./autogen.sh -%endif -%configure \ - --disable-static \ - --enable-gtk-doc \ - --enable-rpm -make %{?_smp_mflags} +%{meson} \ + -Denable-rpm=true \ + -Denable-gtk-doc=true \ + -Denable-stemmer=false \ + %{nil} +%{meson_build} %install -%make_install +%{meson_install} # We don't care for 'installed tests'; that's used by GNOME Smoke Testing. rm %{buildroot}%{_datadir}/installed-tests/appstream-glib/*.test find %{buildroot} -type f -name "*.la" -delete -print # install the appstream process script to be used by kiwi install -d -m 0755 %{_buildroot}%{_bindir} -install -m 0755 -D %{S:1} %{buildroot}%{_bindir}/$(basename %{S:1}) +install -m 0755 -D %{SOURCE1} %{buildroot}%{_bindir}/$(basename %{SOURCE1}) %find_lang %{name} %check -if make check; then +if make %{?_smp_mflags} check; then echo CHECKS passed exit 0 else echo CHECKS failed... dumping log file - find -name test-suite.log -exec cat {} \; + find -name test-suite.log -exec cat {} + exit 0 fi %post -n libappstream-glib8 -p /sbin/ldconfig - %postun -n libappstream-glib8 -p /sbin/ldconfig - %post -n libappstream-builder8 -p /sbin/ldconfig - %postun -n libappstream-builder8 -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/appstream-builder %{_bindir}/appstream-compose %{_bindir}/appstream-util @@ -219,25 +203,20 @@ fi %{_mandir}/man1/appstream-util.1%{?ext_man} %files -n libappstream-builder8 -%defattr(-,root,root) %doc COPYING %{_libdir}/libappstream-builder.so.* %files -n libappstream-glib8 -%defattr(-,root,root) %doc COPYING %{_libdir}/libappstream-glib.so.* %files -n typelib-1_0-AppStreamBuilder-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/AppStreamBuilder-1.0.typelib %files -n typelib-1_0-AppStreamGlib-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/AppStreamGlib-1.0.typelib %files devel -%defattr(-,root,root) %{_datadir}/aclocal/appdata-xml.m4 %{_datadir}/aclocal/appstream-xml.m4 %dir %{_datadir}/gettext/its @@ -253,10 +232,8 @@ fi %{_libdir}/libappstream-glib.so %files lang -f %{name}.lang -%defattr(-,root,root) %files -n openSUSE-appstream-process -%defattr(-,root,root) %{_bindir}/openSUSE-appstream-process %changelog