From 16850082d29c313ff23521995204d816c09ea85f642a5f77010adc056e1f6442 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 6 May 2016 17:56:58 +0000 Subject: [PATCH 1/5] Accepting request 394076 from home:Mailaender:branches:X11:Pantheon document why the parallel build has been disabled OBS-URL: https://build.opensuse.org/request/show/394076 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=17 --- AppStream-0.9.2.tar.xz | 3 -- AppStream-0.9.5.tar.xz | 3 ++ AppStream.changes | 96 ++++++++++++++++++++++++++++++++++++++++++ AppStream.spec | 32 +++++++++++--- 4 files changed, 126 insertions(+), 8 deletions(-) delete mode 100644 AppStream-0.9.2.tar.xz create mode 100644 AppStream-0.9.5.tar.xz diff --git a/AppStream-0.9.2.tar.xz b/AppStream-0.9.2.tar.xz deleted file mode 100644 index 4a92e86..0000000 --- a/AppStream-0.9.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a98ef41cda6a9d991083d0ec1cfdd97a62720ba04a3a983241dcf90f5f8211e -size 1903360 diff --git a/AppStream-0.9.5.tar.xz b/AppStream-0.9.5.tar.xz new file mode 100644 index 0000000..65a858e --- /dev/null +++ b/AppStream-0.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13faec5280fd68be38e6b1094bea9079a1439824023b333bde9884070be9f188 +size 1929872 diff --git a/AppStream.changes b/AppStream.changes index 1466b73..4773068 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,99 @@ +------------------------------------------------------------------- +Fri May 6 17:25:56 UTC 2016 - mailaender@opensuse.org + +- Generate the Vala API + +- Update to version 0.9.5 + +Features: + * Update README (Matthias Klumpp) + * Provide a bit more hints for translators (Matthias Klumpp) + * Improve error messages when reading broken XML (Matthias Klumpp) + * Load all XML in AsXMLData (Matthias Klumpp) + * Implement reading localized images from metadata (Matthias Klumpp) + * Write localized images in XML/YAML serialize routines (Matthias Klumpp) + * Unify codepaths for checking compatible locales (Matthias Klumpp) + * yaml: Implement read/write support for the Languages field (Matthias Klumpp) + * xml: Serialize and read languages tag properly (Matthias Klumpp) + * validator: Validate files in legacy paths too (Matthias Klumpp) + +Specification: + * spec: Allow localized screenshot images (Matthias Klumpp) + +Bugfixes: + * Refactor icon-finding code and fix rare double-free corruption +(Matthias Klumpp) + * Properly validate randomly ordered XML tags for duplicates (Matthias Klumpp) + * validator: The translation tag is only valid in metainfo files +(Matthias Klumpp) + * Be slightly less pedantic about size info when reading screenshot +images (Matthias Klumpp) + * xml: Properly write description tag (Matthias Klumpp) + +- From version 0.9.4 + +Features: + * Handle legacy screenshot tags (Matthias Klumpp) + * Print prettier YAML documents (Matthias Klumpp) + * yaml: Allow loading of distro metadata slices without header +(Matthias Klumpp) + * Do not check for installation candidate on minimal validation +(Matthias Klumpp) + * Don't check if component has an installation candidate before +including it (Matthias Klumpp) + * Quick-check components only when the pool is fully loaded (Matthias Klumpp) + * Support the stub data of GNOME Software (Matthias Klumpp) + * Support reading per-component priorities (Matthias Klumpp) + * Implement the architecture property (Matthias Klumpp) + * Use architecture data to resolve conflicting IDs (Matthias Klumpp) + * Add icon size information to generated XML (Matthias Klumpp) + * xml: Load size hints for icons (Matthias Klumpp) + * l10n: Update + +Specification: + * docs: Explicitly define more minimally required tags per component +type (Matthias Klumpp) + * Make /usr/share/metainfo the canonical path for upstream metadata +(Matthias Klumpp) + * spec: Make architecture a property of , and no tag +(Matthias Klumpp) + * spec: Update the cached icon DEP-11 specification to allow size +information (Matthias Klumpp) + +Bugfixes: + * Fix a few minor issues spotted by the YAML validator (Matthias Klumpp) + * Correctly build distro XML descriptions from upstream XML (Matthias Klumpp) + * Be very strict about which elements are allowed in a description +tag (Matthias Klumpp) + * yaml: Prevent bool keys (Matthias Klumpp) + * ascli: Properly print long descriptions and wrap lines (Matthias Klumpp) + * Export less C++ symbols (Matthias Klumpp) + * Show a better error message when failing to parse XML (Matthias Klumpp) + * Allow adding 0x0 icons (Matthias Klumpp) + * yaml: Implement the updated "cached" icon format in a +backwards-compatible way (Matthias Klumpp) + * apt: Drop flat repository entries (Matthias Klumpp) + * Probe less sizes if we already have size information (Matthias Klumpp) + * Don't make stubs delete package information from valid components +(Matthias Klumpp) + * apt: Handle quoted origin entries properly (Matthias Klumpp) + +- From version 0.9.4 + +Features: + * Allow to update an existing component with fresh metadata + * Implement YAML serialization + * writer: Allow to omit writing a header/root node + * cli: Add convenience method to install metainfo files + * cli: Add a new "status" command for various diagnostic information + * yaml: Allow unicode + * Print prettier XML by default + * l10n: Update + +Bugfixes: + * Reset umask before building the data cache + * apt: Work around APT using server mtime for its downloaded files + ------------------------------------------------------------------- Mon Feb 29 14:05:16 UTC 2016 - tittiatcoke@gmail.com diff --git a/AppStream.spec b/AppStream.spec index c6fd4f7..3876a86 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -17,18 +17,16 @@ Name: AppStream -Version: 0.9.2 +Version: 0.9.5 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: http://www.freedesktop.org/wiki/Distributions/AppStream/Software Source: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz -BuildRequires: cmake +BuildRequires: cmake >= 3.1.0 BuildRequires: gettext BuildRequires: intltool -BuildRequires: libxapian-devel -BuildRequires: libyaml-devel BuildRequires: xmlto BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) @@ -37,6 +35,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(xapian-core) +BuildRequires: pkgconfig(yaml-0.1) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libappstream3 @@ -95,6 +96,18 @@ all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. +%package vala +Summary: Simple software installation management software -- Vala bindings +License: LGPL-2.1+ +Group: System/Libraries + +%description vala +These are the AppStream vala language bindings. + +Vala is a new programming language that aims to bring modern programming language features +without imposing any additional runtime requirements and without using a different ABI compared +to applications and libraries written in C. + %lang_package %prep @@ -108,10 +121,13 @@ SUFFIX="" %endif %cmake -DQT=ON \ + -DVAPI=ON \ -DINSTALL_PREBUILT_DOCS=OFF \ -DDOCUMENTATION=OFF \ -DAPPSTREAM_QT_VERSION=5 -make %{?_smp_mflags} + +# no parallel build due to https://github.com/ximion/appstream/issues/40 +make %install %make_install -C build @@ -170,4 +186,10 @@ make %{?_smp_mflags} %doc LICENSE* %{_libdir}/girepository-1.0/AppStream-1.0.typelib +%files vala +%defattr(-,root,root) +%dir %{_datadir}/vala/ +%dir %{_datadir}/vala/vapi/ +%{_datadir}/vala/vapi/appstream.vapi + %changelog From 833787497a13417f0cb4f1ec765e7bfc5bf4469325fc78d0c7389caec24b02c3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 12 May 2016 07:42:08 +0000 Subject: [PATCH 2/5] Accepting request 394217 from home:Mailaender:branches:KDE:Frameworks5 fix a typo and some redundancy OBS-URL: https://build.opensuse.org/request/show/394217 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=18 --- AppStream.changes | 2 +- AppStream.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AppStream.changes b/AppStream.changes index 4773068..efb7bd3 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -78,7 +78,7 @@ backwards-compatible way (Matthias Klumpp) (Matthias Klumpp) * apt: Handle quoted origin entries properly (Matthias Klumpp) -- From version 0.9.4 +- From version 0.9.3 Features: * Allow to update an existing component with fresh metadata diff --git a/AppStream.spec b/AppStream.spec index 3876a86..a92e569 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -111,7 +111,7 @@ to applications and libraries written in C. %lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q %build %if "%{?_lib}" == "lib64" From 400c0f8209a889a1c8d4c6ee930c182ecfaef203ea478aa8705cbbf4936eeb72 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 12 May 2016 07:43:02 +0000 Subject: [PATCH 3/5] Accepting request 394272 from home:jengelh:branches:KDE:Frameworks5 - Drop unnecessary manual library require - Avoid /bin/sh invocation for simple ldconfig calls OBS-URL: https://build.opensuse.org/request/show/394272 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=19 --- AppStream.changes | 6 ++++++ AppStream.spec | 13 ++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/AppStream.changes b/AppStream.changes index efb7bd3..251f5ee 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 8 19:25:29 UTC 2016 - jengelh@inai.de + +- Drop unnecessary manual library require +- Avoid /bin/sh invocation for simple ldconfig calls + ------------------------------------------------------------------- Fri May 6 17:25:56 UTC 2016 - mailaender@opensuse.org diff --git a/AppStream.spec b/AppStream.spec index a92e569..c919e03 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -39,7 +39,6 @@ BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(xapian-core) BuildRequires: pkgconfig(yaml-0.1) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libappstream3 %description AppStream-Core makes it easy to access application information from the @@ -134,17 +133,13 @@ make %find_lang appstream %{name}.lang -%post -n libappstream3 -/sbin/ldconfig +%post -n libappstream3 -p /sbin/ldconfig -%postun -n libappstream3 -/sbin/ldconfig +%postun -n libappstream3 -p /sbin/ldconfig -%post -n libAppstreamQt1 -/sbin/ldconfig +%post -n libAppstreamQt1 -p /sbin/ldconfig -%postun -n libAppstreamQt1 -/sbin/ldconfig +%postun -n libAppstreamQt1 -p /sbin/ldconfig %files lang -f %{name}.lang From 30e6d7d09d2cb4a35578d9374bdb31ccfcaa544b25daa363b2a61b05a5ed0ce1 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Wed, 18 May 2016 08:34:10 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=20 --- AppStream.spec | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/AppStream.spec b/AppStream.spec index c919e03..a629a67 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -95,18 +95,6 @@ all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. -%package vala -Summary: Simple software installation management software -- Vala bindings -License: LGPL-2.1+ -Group: System/Libraries - -%description vala -These are the AppStream vala language bindings. - -Vala is a new programming language that aims to bring modern programming language features -without imposing any additional runtime requirements and without using a different ABI compared -to applications and libraries written in C. - %lang_package %prep @@ -175,16 +163,13 @@ make %{_includedir}/AppStream/ %{_datadir}/gir-1.0/AppStream-1.0.gir %{_datadir}/gettext/ +%dir %{_datadir}/vala/ +%dir %{_datadir}/vala/vapi/ +%{_datadir}/vala/vapi/appstream.vapi %files -n typelib-1_0-AppStream-1.0 %defattr(-,root,root) %doc LICENSE* %{_libdir}/girepository-1.0/AppStream-1.0.typelib -%files vala -%defattr(-,root,root) -%dir %{_datadir}/vala/ -%dir %{_datadir}/vala/vapi/ -%{_datadir}/vala/vapi/appstream.vapi - %changelog From 058b885d58f69173530f177d2b88283ac974af43859529ccc8c7f36b86ea2e3d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Wed, 18 May 2016 08:35:01 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=21 --- AppStream.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AppStream.changes b/AppStream.changes index 251f5ee..f88bf87 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 18 08:34:41 UTC 2016 - tittiatcoke@gmail.com + +- Drop the separate Vala package and include the files into the + devel package + ------------------------------------------------------------------- Sun May 8 19:25:29 UTC 2016 - jengelh@inai.de