diff --git a/.gitignore b/.gitignore index 7750626..9f61b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/AppStream-0.7.2.tar.xz +/AppStream-0.7.3.tar.xz diff --git a/0002-Treat-the-text-plain-mimetype-equal-to-YAML-or-XML.patch b/0002-Treat-the-text-plain-mimetype-equal-to-YAML-or-XML.patch deleted file mode 100644 index 4ba45c4..0000000 --- a/0002-Treat-the-text-plain-mimetype-equal-to-YAML-or-XML.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c5e9ce4e907dc5dee5e8afdb441dc745b2c3e71c Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Mon, 22 Sep 2014 17:30:09 +0200 -Subject: [PATCH 2/5] Treat the text/plain mimetype equal to YAML or XML - ---- - src/data-providers/appstream-xml.c | 2 +- - src/data-providers/debian-dep11.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/data-providers/appstream-xml.c b/src/data-providers/appstream-xml.c -index 1791042..40e390b 100644 ---- a/src/data-providers/appstream-xml.c -+++ b/src/data-providers/appstream-xml.c -@@ -276,7 +276,7 @@ as_provider_xml_real_execute (AsDataProvider* base) - continue; - } - content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); -- if (g_strcmp0 (content_type, "application/xml") == 0) { -+ if ((g_strcmp0 (content_type, "application/xml") == 0) || (g_strcmp0 (content_type, "text/plain") == 0)) { - ret = as_provider_xml_process_file (dprov, infile); - } else if (g_strcmp0 (content_type, "application/gzip") == 0 || - g_strcmp0 (content_type, "application/x-gzip") == 0) { -diff --git a/src/data-providers/debian-dep11.c b/src/data-providers/debian-dep11.c -index 630fe30..e826e4f 100644 ---- a/src/data-providers/debian-dep11.c -+++ b/src/data-providers/debian-dep11.c -@@ -794,7 +794,7 @@ as_provider_dep11_real_execute (AsDataProvider* base) - continue; - } - content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); -- if (g_strcmp0 (content_type, "application/x-yaml") == 0) { -+ if ((g_strcmp0 (content_type, "application/x-yaml") == 0) || (g_strcmp0 (content_type, "text/plain") == 0)) { - ret = as_provider_dep11_process_file (dprov, infile); - } else if (g_strcmp0 (content_type, "application/gzip") == 0 || - g_strcmp0 (content_type, "application/x-gzip") == 0) { --- -2.1.0 - diff --git a/0004-spec-Update-the-icon-cache-layout-to-allow-icons-wit.patch b/0004-spec-Update-the-icon-cache-layout-to-allow-icons-wit.patch deleted file mode 100644 index 27fe53b..0000000 --- a/0004-spec-Update-the-icon-cache-layout-to-allow-icons-wit.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c084ad4841cca401d4819bb1bc863ecb06685548 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Fri, 26 Sep 2014 15:15:05 +0200 -Subject: [PATCH 4/5] spec: Update the icon-cache layout to allow icons with - larger sizes - ---- - docs/sources/distrospec/iconcache.xml | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/docs/sources/distrospec/iconcache.xml b/docs/sources/distrospec/iconcache.xml -index 695c0fd..b2f351f 100644 ---- a/docs/sources/distrospec/iconcache.xml -+++ b/docs/sources/distrospec/iconcache.xml -@@ -20,12 +20,21 @@ -
- Filesystem locations - -- All icons should be placed in /usr/share/app-info/icons/%{origin}/ or /var/cache/app-info/icons/%{origin}/, -- where origin is the AppStream data origin defined in the AppStream data file (see ). -+ All icons of type cached must be placed in /usr/share/app-info/icons/%{origin}/%{size}/ or /var/cache/app-info/icons/%{origin}/%{size}/, -+ where origin is the AppStream data origin defined in the AppStream data file (see ), and size -+ is 64x64 or 128x128 depending on the size of the icon. And icon might be present with different sizes in both directories. - - -- The icon directory should not have subdirectories at the current time. All icons are store in one size. -+ For example the cache icon krita.png of a component in a data file with the origin jessie should be stored in -+ /usr/share/app-info/icons/jessie/64x64/krita.png (or in the /var/cache location). - -+ -+ Legacy Support -+ -+ In order to support the old icon cache layout, client applications may also look for icons in the folder below the size-directories, assuming -+ that the icons placed there are of size 64x64 pixels. -+ -+ -
- - --- -2.1.0 - diff --git a/0005-Include-QMultiHash.patch b/0005-Include-QMultiHash.patch deleted file mode 100644 index 88c7d54..0000000 --- a/0005-Include-QMultiHash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1f3690d1f2ff28c62aa244264f23f26a68589a01 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Tue, 30 Sep 2014 15:53:11 +0200 -Subject: [PATCH 5/5] Include QMultiHash - -Otherwise it fails to build on some systems. It's used so it needs -to be pulled. ---- - qt/src/component.cpp | 1 + - qt/src/database.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/qt/src/component.cpp b/qt/src/component.cpp -index a829edd..5b84c0a 100644 ---- a/qt/src/component.cpp -+++ b/qt/src/component.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - using namespace Appstream; - -diff --git a/qt/src/database.cpp b/qt/src/database.cpp -index 3279e9b..ff0720f 100644 ---- a/qt/src/database.cpp -+++ b/qt/src/database.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - using namespace Appstream; - --- -2.1.0 - diff --git a/appstream.spec b/appstream.spec index 8612a4a..627c386 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,11 +1,13 @@ -# Qt5 support uses the same library names +# Qt5 support uses the same base library names, so not parallel-installable #global qt5 1 +# Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) +#global vala 1 Summary: Utilities to generate, maintain and access the AppStream Xapian database Name: appstream -Version: 0.7.2 -Release: 2%{?dist} +Version: 0.7.3 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -13,9 +15,6 @@ URL: http://www.freedesktop.org/wiki/Distributions/AppStream/Software Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz ## upstream patches -Patch2: 0002-Treat-the-text-plain-mimetype-equal-to-YAML-or-XML.patch -Patch4: 0004-spec-Update-the-icon-cache-layout-to-allow-icons-wit.patch -Patch5: 0005-Include-QMultiHash.patch ## upstreamable patches @@ -35,6 +34,10 @@ BuildRequires: xmlto Requires: appstream-data +%if 0%{?vala} +Obsoletes: appstream-vala < 0.7.3 +%endif + %description AppStream-Core makes it easy to access application information from the AppStream database over a nice GObject-based interface. @@ -71,6 +74,7 @@ Requires: pkgconfig(Qt5Core) %description qt5-devel %{summary}. +%if 0%{?vala} %package vala Summary: Vala bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -78,6 +82,7 @@ BuildRequires: vala-tools Requires: vala %description vala %{summary}. +%endif %prep @@ -90,12 +95,11 @@ pushd %{_target_platform} %{cmake} \ -DQT:BOOL=ON -DAPPSTREAM_QT_VERSION:STRING="4"\ -DTESTS:BOOL=ON \ - -DVAPI:BOOL=ON \ + -DVAPI:BOOL=%{?vala:ON}%{!?vala:OFF} \ .. popd -# parallel build currently fails -make -j1 -C %{_target_platform} +make %{?_smp_mflags} -C %{_target_platform} %if 0%{?qt5} mkdir -p %{_target_platform}-qt5 @@ -103,11 +107,11 @@ pushd %{_target_platform}-qt5 %{cmake} \ -DQT:BOOL=ON -DAPPSTREAM_QT_VERSION:STRING="5"\ -DTESTS:BOOL=ON \ - -DVAPI:BOOL=ON \ + -DVAPI:BOOL=%{?vala:ON}%{!?vala:OFF} \ .. popd -make -j1 -C %{_target_platform}-qt5 +make %{?_smp_mflags} -C %{_target_platform}-qt5 %endif @@ -125,8 +129,7 @@ touch %{buildroot}/var/cache/app-info/cache.watch %check -# all/many tests currently fail, make non-fatal for now -make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: +make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %post -p /sbin/ldconfig @@ -143,7 +146,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %{_bindir}/appstream-validate %{_mandir}/man1/appstream-validate.1* %dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/Appstream-0.7.typelib +%{_libdir}/girepository-1.0/AppStream-0.7.typelib %{_libdir}/libappstream.so.1* %{_libdir}/libappstream.so.%{version} %dir %{_datadir}/app-info/ @@ -158,11 +161,11 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %{_mandir}/man1/appstream-index.1* %files devel -%{_includedir}/Appstream/ +%{_includedir}/AppStream/ %{_libdir}/libappstream.so %{_libdir}/pkgconfig/appstream.pc %dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Appstream-0.7.gir +%{_datadir}/gir-1.0/AppStream-0.7.gir %post qt -p /sbin/ldconfig @@ -176,11 +179,17 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %{_libdir}/cmake/AppstreamQt/ %{_libdir}/libAppstreamQt.so +%if 0%{?vala} %files vala %{_datadir}/vala/vapi/appstream.vapi +%endif %changelog +* Mon Oct 13 2014 Rex Dieter - 0.7.3-1 +- 0.7.3 +- omit vala support (for now, build broken) + * Tue Sep 30 2014 Rex Dieter 0.7.2-2 - pull in some upstream fixes, fix %%posttrans scriptlet diff --git a/sources b/sources index fd08dce..fc3d7f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -538a86023f05f28642fd9445b1d1e3e8 AppStream-0.7.2.tar.xz +4122bdb392a2bdc3e500d3060e786e5e AppStream-0.7.3.tar.xz