diff --git a/0001-Fix-regression-from-153.patch b/0001-Fix-regression-from-153.patch new file mode 100644 index 0000000..e7e4704 --- /dev/null +++ b/0001-Fix-regression-from-153.patch @@ -0,0 +1,25 @@ +From 3e58f9c97d95785b2bcab632871a59a04050a458 Mon Sep 17 00:00:00 2001 +From: Gabriel Souza Franco +Date: Wed, 24 Jan 2018 14:26:28 +0100 +Subject: [PATCH] qt: Fix regression from #153 + +Define location and soname for all configurations, not just Debug. +--- + qt/cmake/AppStreamQtConfig.cmake.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qt/cmake/AppStreamQtConfig.cmake.in b/qt/cmake/AppStreamQtConfig.cmake.in +index aa61e820..b64a4f57 100644 +--- a/qt/cmake/AppStreamQtConfig.cmake.in ++++ b/qt/cmake/AppStreamQtConfig.cmake.in +@@ -32,8 +32,8 @@ add_library(AppStreamQt SHARED IMPORTED) + set_target_properties(AppStreamQt PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/" + INTERFACE_LINK_LIBRARIES "Qt5::Core" +- IMPORTED_LOCATION_DEBUG "@LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}" +- IMPORTED_SONAME_DEBUG "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}" ++ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt.so.${AppStreamQt_VERSION}" ++ IMPORTED_SONAME "libAppStreamQt.${AppStreamQt_VERSION_MAJOR}" + ) + + #################################################################################### diff --git a/AppStream-0.11.1.tar.xz b/AppStream-0.11.1.tar.xz deleted file mode 100644 index 7df22fb..0000000 --- a/AppStream-0.11.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5d43fb30a3419fa219d09281cd52e2aa7c335f3980b9e161e537a6826c143c4 -size 2009920 diff --git a/AppStream-0.11.8.tar.xz b/AppStream-0.11.8.tar.xz new file mode 100644 index 0000000..d8da44e --- /dev/null +++ b/AppStream-0.11.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54a6c443e51c2e016fe5031f8f1865500bb7a7807b8514355f4841298b85edf3 +size 1906960 diff --git a/AppStream.changes b/AppStream.changes index 4df3ab3..2557ee6 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,136 @@ +------------------------------------------------------------------- +Mon Jan 29 15:38:08 UTC 2018 - alarrosa@suse.com + +- Now the appstream cache is refreshed in %post. The update to 0.11.8 + plus the refresh fixes kde#389531. + +- Headers are now installed to /usr/include/appstream instead of + /usr/inlude/AppStream + +- New package AppStream-doc with the html documentation for AppStream + +- Use meson to build instead of cmake + +- Update to version 0.11.8: + + Features: + * validator: Emit a hint in case a discouraged AppStream ID style is used (Matthias Klumpp) + * l10n: Renamed Norwegian Bokmål language file (Matthias Klumpp) + + Specification: + * docs: Add quickstart instructions for intltool (David Steele) + * spec: Discourage use of hyphens and digit-started segments for IDs (Matthias Klumpp) + + Bugfixes: + * qt: Export the AppStreamQt target (Aleix Pol) + * Various string improvements (Allan Nordhøy) + * validator: Don't make HEAD requests for URL checks, fetch first byte instead (Matthias Klumpp) + * Enforce a non-broken version of gobject-introspection (Matthias Klumpp) + * Ensure LINGUAS update is only run explicitly (Matthias Klumpp) + * Fix a minor memory and fd leak (Matthias Klumpp) + +- Update to version 0.11.7: + + Notes: + * The appstreamcli validation commands now use curl if it is available to check all + URLs in the metadata for existence. + If you don't want this behavior, pass "--nonet" to appstreamcli. There might also + be false positives (one is known with the KDE bugtracker) that need to be investigated, + so feedback on this new feature is welcome. + + Features: + * validator: Check all urls for validity (Matthias Klumpp) + * validator: Check web-application components for missing tags (Matthias Klumpp) + * Add API to retrieve the AppStream library version (Matthias Klumpp) + * apt: Allow fetching 128x128@2 HiDPI icons (Rico Tzschichholz) + + Specification: + * Add the "url" launchable type (Dimitrios Christidis) + * spec: Clarify some icon details in the collection data (Marius Vollmer) + * spec: Allow tags in generic components (Marius Vollmer) + * spec: Specify the web-application component type (Matthias Klumpp) + + Bugfixes: + * Fix endless loop when validating screenshots (Matthias Klumpp) + * ascli: Show a list of component-types when --help is passed to new-template (Matthias Klumpp) + * validator: Drop the wget fallback, making missing curl only an info (Matthias Klumpp) + * meson: Properly define header-file in gir (Rico Tzschichholz) + +- Update to version 0.11.6: + + Features: + * Improve screenshot validation (Matthias Klumpp) + * Allow to disable introspection (Matthias Klumpp) + + Bugfixes: + * Revert back to the old build option names (Matthias Klumpp) + * Apply maintainer flags equally to C++ and C (Matthias Klumpp) + * Explicitly set C/C++ standard versions (Matthias Klumpp) + * vapi: Include the right header (Matthias Klumpp) + * xml: Correctly write screenshots tag again (Matthias Klumpp) + * Do not cache a screenshot that doesn't have images (Matthias Klumpp) + * xml: Support legacy screenshot tags again (Matthias Klumpp) + +- Update to version 0.11.5: + + Features: + * Restructure build feature flags (Matthias Klumpp) + * Allow disabling API documentation build (Matthias Klumpp) + + Bugfixes: + * qt: Don't check bitness when finding AppStreamQt (Matthias Klumpp) + +- Update to version 0.11.4: + + Notes: + * This release switches the build system from CMake to Meson. You will need + Meson (>= 0.42) in order to build AppStream. Please test for any regressions. + + Features: + * Implement Meson support (Matthias Klumpp) + * meson: Make build with sanitizers (partially) work again (Matthias Klumpp) + * meson: Add helper script for building documentation (Matthias Klumpp) + * docs: Always rebuild documentation on-demand (Matthias Klumpp) + * Update README for Meson (Matthias Klumpp) + * Implement cockpit-manifest launchable type (Matthias Klumpp) + * validator: Actually validate the type property of "launchable" tags (Matthias Klumpp) + * Allow to search the pool for components that provide a launchable (Matthias Klumpp) + * qt: Add new function to search components by launchable (Matthias Klumpp) + + Specification: + * spec: New "cockpit-manifest" launchable type (Marius Vollmer) + + Bugfixes: + * validator: Complain if a component has no ID (Matthias Klumpp) + +- Update to version 0.11.3: + + Bugfixes: + * qt: Don't crash when an error is found and no error string is passed (Aleix Pol) + * Propagate document context to the context object for XML files (Matthias Klumpp) + * validator: Correctly recognize "launchable" as valid tag (Matthias Klumpp) + +- Update to version 0.11.2: + + Features: + * cache: Refactor cache functions (Matthias Klumpp) + * Deduplicate origin/locale/arch with AsContext (Matthias Klumpp) + * Get rid of a couple of internal helper methods (Matthias Klumpp) + * cli: When using convert, always assume collection style for YAML (Matthias Klumpp) + + Specification: + * Adjust docs to clearly state that licenses are SPDX expressions (Harald Sitter) + + Bugfixes: + * qt: Improve Icon QDebug information (Aleix Pol) + * Resolve crash when serializing lots of XML documents (Matthias Klumpp) + * xml: Don't truncate translated entries after encounting a wrong locale (Matthias Klumpp) + * Set a real locale if locale is set to "ALL" (Matthias Klumpp) + * validator: Make ending dot in component name only a pedantic issue (Matthias Klumpp) + +- Add patch to export the AppStreamQt target correctly: + * 0001-Fix-regression-from-153.patch + ------------------------------------------------------------------- Wed Jul 5 09:09:42 UTC 2017 - fabian@ritter-vogt.de diff --git a/AppStream.spec b/AppStream.spec index caea2de..ee681da 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -1,7 +1,7 @@ # # spec file for package AppStream # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,18 @@ %define libAppStreamQt_sover 2 Name: AppStream -Version: 0.11.1 +Version: 0.11.8 Release: 0 Summary: Utilities to generate, maintain and access the AppStream Xapian database License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Url: https://www.freedesktop.org/software/appstream/docs/ Source: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz -BuildRequires: cmake >= 3.1.0 +Patch0: 0001-Fix-regression-from-153.patch BuildRequires: gettext BuildRequires: intltool BuildRequires: itstool +BuildRequires: meson >= 0.42 BuildRequires: xmlto BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) @@ -88,6 +89,17 @@ This package contains all necessary include files, libraries, configuration files and development tools (with manual pages) needed to compile and link applications using AppStream. +%package doc +Summary: Documentation for AppStream +License: GPL-2.0+ +Group: Documentation/HTML + +%description doc +AppStream-Core makes it easy to access application information from the +AppStream database over a nice GObject-based interface. + +This package contains the documentation files for AppStream. + %package -n typelib-1_0-AppStream-1.0 Summary: Simple software installation management software -- Introspection bindings License: LGPL-2.1+ @@ -104,6 +116,7 @@ suck less. %prep %setup -q +%patch0 -p1 %build %if "%{?_lib}" == "lib64" @@ -112,20 +125,21 @@ SUFFIX="64" SUFFIX="" %endif -%cmake -DQT=ON \ - -DVAPI=ON \ - -DINSTALL_PREBUILT_DOCS=OFF \ - -DDOCUMENTATION=OFF \ - -DSTEMMING=OFF \ - -DAPPSTREAM_QT_VERSION=5 - -%make_jobs +%meson -Dqt=true \ + -Dvapi=true \ + -Ddocs=false \ + -Dapidocs=false \ + -Dstemming=false +%meson_build %install -%make_install -C build +%meson_install %find_lang appstream %{name}.lang +%post +appstreamcli refresh --force || true + %post -n libappstream%{libappstream_sover} -p /sbin/ldconfig %postun -n libappstream%{libappstream_sover} -p /sbin/ldconfig @@ -165,7 +179,7 @@ SUFFIX="" %defattr(-,root,root) %{_libdir}/libappstream.so %{_libdir}/pkgconfig/appstream.pc -%{_includedir}/AppStream/ +%{_includedir}/appstream/ %{_datadir}/gir-1.0/AppStream-1.0.gir %{_datadir}/gettext/ %dir %{_datadir}/vala/ @@ -178,4 +192,8 @@ SUFFIX="" %doc LICENSE* %{_libdir}/girepository-1.0/AppStream-1.0.typelib +%files doc +%defattr(-,root,root) +%{_datadir}/doc/appstream + %changelog