From cb1abc795721bfcb5a1cb0cb778ebfddb7c58b7d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Oct 2021 14:17:08 -0500 Subject: [PATCH 01/37] 0.14.6 --- .gitignore | 1 + appstream.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9e16b59..6a7e3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /AppStream-0.14.3.tar.xz /AppStream-0.14.4.tar.xz /AppStream-0.14.5.tar.xz +/AppStream-0.14.6.tar.xz diff --git a/appstream.spec b/appstream.spec index e1dcf8c..3cbaf71 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,7 +4,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.14.5 +Version: 0.14.6 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -211,6 +211,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Tue Oct 12 2021 Rex Dieter - 0.14.6-1 +- 0.14.6 + * Sat Aug 28 2021 Neal Gompa - 0.14.5-1 - Update to 0.14.5 diff --git a/sources b/sources index 6a4e9fa..d7184ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.14.5.tar.xz) = 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c +SHA512 (AppStream-0.14.6.tar.xz) = 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0 From ec0b6a16742017e646ec7f5c06be66ea8dec31f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Dec 2021 09:46:45 -0600 Subject: [PATCH 02/37] 0.15.1 (#2028696) update triggers to consistently use --force flag on 'appstreamcli refresh' calls --- .gitignore | 1 + appstream.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6a7e3ee..ac2e516 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /AppStream-0.14.4.tar.xz /AppStream-0.14.5.tar.xz /AppStream-0.14.6.tar.xz +/AppStream-0.15.1.tar.xz diff --git a/appstream.spec b/appstream.spec index 3cbaf71..b76072a 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,7 +4,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.14.6 +Version: 0.15.1 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -137,10 +137,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_bindir}/appstreamcli refresh --force >& /dev/null ||: %transfiletriggerpostun -- %{_datadir}/app-info/xmls -%{_bindir}/appstreamcli refresh >& /dev/null ||: +%{_bindir}/appstreamcli refresh --force >& /dev/null ||: %else %triggerun -- appstream-data -%{_bindir}/appstreamcli refresh >& /dev/null ||: +%{_bindir}/appstreamcli refresh --force >& /dev/null ||: %endif %files -f appstream.lang @@ -211,6 +211,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Dec 29 2021 Rex Dieter - 0.15.1-1 +- 0.15.1 (#2028696) +- update triggers to consistently use --force flag on 'appstreamcli refresh' calls + * Tue Oct 12 2021 Rex Dieter - 0.14.6-1 - 0.14.6 diff --git a/sources b/sources index d7184ef..78d8059 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.14.6.tar.xz) = 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0 +SHA512 (AppStream-0.15.1.tar.xz) = 31e5cf47b3b10401dc70d3c624a0066ab044e50f9afeee82c01d6b863abcd2e09d4ec3641286bafa8cb0b167d831735a95d6220a70a4ac980f6cc3dc58c29c22 From dee35fcf87c70f5689eeae806c16038830053b1d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 30 Dec 2021 10:06:38 -0600 Subject: [PATCH 03/37] BR: xmlb --- appstream.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index b76072a..6a856c2 100644 --- a/appstream.spec +++ b/appstream.spec @@ -41,9 +41,10 @@ BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(protobuf-lite) BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(xmlb) +BuildRequires: pkgconfig(yaml-0.1) # lrelease BuildRequires: qt5-linguist -BuildRequires: pkgconfig(yaml-0.1) BuildRequires: sed BuildRequires: vala BuildRequires: xmlto From 960d047861a7681a86cd9e7c309b6ec2fd627f15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:29:31 +0000 Subject: [PATCH 04/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 6a856c2..ec41368 100644 --- a/appstream.spec +++ b/appstream.spec @@ -5,7 +5,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.15.1 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -212,6 +212,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 29 2021 Rex Dieter - 0.15.1-1 - 0.15.1 (#2028696) - update triggers to consistently use --force flag on 'appstreamcli refresh' calls From f047ec8fe55bbd0104a1efd65ac48c1d4425beaa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 23 Feb 2022 08:57:06 -0600 Subject: [PATCH 05/37] 0.15.2 support only filetriggers --- .gitignore | 1 + appstream.spec | 20 +++++++------------- sources | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index ac2e516..f5d655f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /AppStream-0.14.5.tar.xz /AppStream-0.14.6.tar.xz /AppStream-0.15.1.tar.xz +/AppStream-0.15.2.tar.xz diff --git a/appstream.spec b/appstream.spec index ec41368..ce06645 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,8 +4,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.15.1 -Release: 2%{?dist} +Version: 0.15.2 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -129,25 +129,15 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %posttrans %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -## use file triggers instead of static pkg names -## other repos can provide appdata too -%if 0%{?fedora} > 25 -## not sure how smart appstreamcli is about cache validation -## to judge if --force is really needed here or not -- rex %transfiletriggerin -- %{_datadir}/app-info/xmls %{_bindir}/appstreamcli refresh --force >& /dev/null ||: %transfiletriggerpostun -- %{_datadir}/app-info/xmls %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%else -%triggerun -- appstream-data -%{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%endif %files -f appstream.lang %doc AUTHORS -%license LICENSE.GPLv2 -%license LICENSE.LGPLv2.1 +%license COPYING %{_bindir}/appstreamcli %{_mandir}/man1/appstreamcli.1* %config(noreplace) %{_sysconfdir}/appstream.conf @@ -212,6 +202,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Feb 23 2022 Rex Dieter - 0.15.2-1 +- 0.15.2 +- support only filetriggers + * Wed Jan 19 2022 Fedora Release Engineering - 0.15.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 78d8059..28613cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.15.1.tar.xz) = 31e5cf47b3b10401dc70d3c624a0066ab044e50f9afeee82c01d6b863abcd2e09d4ec3641286bafa8cb0b167d831735a95d6220a70a4ac980f6cc3dc58c29c22 +SHA512 (AppStream-0.15.2.tar.xz) = 133e3019b0a7d303bd6f1178b85897967c193b9718d498bacd7e8fb10933a0971d375979092a152e3419572cfe4595fe08c1c89b27429bebaec17e4b10e10c78 From bb58c7d643f2ce7c39509a2d6a1ab95f552b67a0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 19 Apr 2022 14:13:53 -0500 Subject: [PATCH 06/37] 0.15.3 --- .gitignore | 1 + appstream.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5d655f..a67260c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /AppStream-0.14.6.tar.xz /AppStream-0.15.1.tar.xz /AppStream-0.15.2.tar.xz +/AppStream-0.15.3.tar.xz diff --git a/appstream.spec b/appstream.spec index ce06645..48faae7 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,7 +4,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.15.2 +Version: 0.15.3 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -202,6 +202,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Tue Apr 19 2022 Rex Dieter 0.15.3-1 +- 0.15.3 + * Wed Feb 23 2022 Rex Dieter - 0.15.2-1 - 0.15.2 - support only filetriggers diff --git a/sources b/sources index 28613cc..df326fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.15.2.tar.xz) = 133e3019b0a7d303bd6f1178b85897967c193b9718d498bacd7e8fb10933a0971d375979092a152e3419572cfe4595fe08c1c89b27429bebaec17e4b10e10c78 +SHA512 (AppStream-0.15.3.tar.xz) = f38eda7cb8da95fca2dbbd1aecca17ce74b2e3c438a82cffbd7485b24a3588fccbc91d8c5eb83d2840da1d9bde4e8ed73bcc1c68809581c982fac753f622b866 From 8adebb571b8557cc9fd3e665a9957939a5a68c91 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 11 May 2022 13:38:40 -0500 Subject: [PATCH 07/37] bump meson dep --- appstream.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 48faae7..3ca8ec9 100644 --- a/appstream.spec +++ b/appstream.spec @@ -19,7 +19,7 @@ Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{vers # needed for cmake auto-provides BuildRequires: cmake -BuildRequires: meson +BuildRequires: meson >= 0.62 BuildRequires: gettext BuildRequires: gperf BuildRequires: gtk-doc From 6914a9dd4839d9965ada0ff97d7b7f382885e55a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 11 May 2022 13:45:58 -0500 Subject: [PATCH 08/37] update %%files --- appstream.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appstream.spec b/appstream.spec index 3ca8ec9..2a6544f 100644 --- a/appstream.spec +++ b/appstream.spec @@ -188,6 +188,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_libdir}/libappstream-compose.so %{_libdir}/pkgconfig/appstream-compose.pc %{_datadir}/gir-1.0/AppStreamCompose-1.0.gir +%dir %{_datadir}/gtk-doc/ +%dir %{_datadir}/gtk-doc/html/ +%{_datadir}/gtk-doc/html/appstream-compose %ldconfig_scriptlets qt From 82a1fa2bb8664ba2410f28ebfc280b487c5b4e54 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jun 2022 14:47:58 -0500 Subject: [PATCH 09/37] 0.15.4 --- .gitignore | 1 + appstream.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a67260c..57cea08 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /AppStream-0.15.1.tar.xz /AppStream-0.15.2.tar.xz /AppStream-0.15.3.tar.xz +/AppStream-0.15.4.tar.xz diff --git a/appstream.spec b/appstream.spec index 2a6544f..a5e63f4 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,7 +4,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.15.3 +Version: 0.15.4 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -205,6 +205,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Tue Jun 07 2022 Rex Dieter - 0.15.4-1 +- 0.15.4 + * Tue Apr 19 2022 Rex Dieter 0.15.3-1 - 0.15.3 diff --git a/sources b/sources index df326fa..bcca9b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.15.3.tar.xz) = f38eda7cb8da95fca2dbbd1aecca17ce74b2e3c438a82cffbd7485b24a3588fccbc91d8c5eb83d2840da1d9bde4e8ed73bcc1c68809581c982fac753f622b866 +SHA512 (AppStream-0.15.4.tar.xz) = 815295fb37d34ae4dff0a8d0a465b5a37286cfa02ac9ae940f77daeab3ca0e2b3519e72cd7e4c61d67298bcc0c94f64ebb50bcde8e2d5fe2f6aa4b188346a27e From 937aa45e073fffde1c08e6c6d0f97e6f8bb200f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:04:55 +0000 Subject: [PATCH 10/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index a5e63f4..58b366b 100644 --- a/appstream.spec +++ b/appstream.spec @@ -5,7 +5,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.15.4 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -205,6 +205,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.15.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 07 2022 Rex Dieter - 0.15.4-1 - 0.15.4 From 7234b6a9a76df8b0556bf892269f3715ed38bbb8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 Sep 2022 08:45:20 -0500 Subject: [PATCH 11/37] 0.15.5 --- .gitignore | 1 + appstream.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 57cea08..08273c0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /AppStream-0.15.2.tar.xz /AppStream-0.15.3.tar.xz /AppStream-0.15.4.tar.xz +/AppStream-0.15.5.tar.xz diff --git a/appstream.spec b/appstream.spec index 58b366b..961f895 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,8 +4,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.15.4 -Release: 2%{?dist} +Version: 0.15.5 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -205,6 +205,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Sep 02 2022 Rex Dieter - 0.15.5-1 +- 0.15.5 + * Wed Jul 20 2022 Fedora Release Engineering - 0.15.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index bcca9b6..b199102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.15.4.tar.xz) = 815295fb37d34ae4dff0a8d0a465b5a37286cfa02ac9ae940f77daeab3ca0e2b3519e72cd7e4c61d67298bcc0c94f64ebb50bcde8e2d5fe2f6aa4b188346a27e +SHA512 (AppStream-0.15.5.tar.xz) = 83202a8db9a31e4328b2a831b02e65389aad1ba95a4c2b2709084fb843cb3675af6fac73f932a31bb3a6d3ff5db85a863c01528be67d9bbd3b9614a978239771 From 1578ced83e19ce0b2961a2fe53fd9dcaf92bb2fa Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 8 Jun 2022 09:37:50 +0000 Subject: [PATCH 12/37] Allow building without Qt dependencies Compiling with --without=qt will not pull in Qt dependencies, and will also not produce the -qt subpackages. --- appstream.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 961f895..c2b4c4b 100644 --- a/appstream.spec +++ b/appstream.spec @@ -5,7 +5,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.15.5 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -13,6 +13,8 @@ License: GPLv2+ and LGPLv2+ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz +%bcond qt 1 + ## upstream patches (lookaside cache) ## upstreamable patches @@ -40,11 +42,15 @@ BuildRequires: pkgconfig(lmdb) BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(protobuf-lite) +%if %{with qt} BuildRequires: pkgconfig(Qt5Core) +%endif BuildRequires: pkgconfig(xmlb) BuildRequires: pkgconfig(yaml-0.1) # lrelease +%if %{with qt} BuildRequires: qt5-linguist +%endif BuildRequires: sed BuildRequires: vala BuildRequires: xmlto @@ -77,6 +83,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description compose-devel %{summary}. +%if %{with qt} %package qt Summary: Qt5 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -89,6 +96,7 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release} Requires: pkgconfig(Qt5Core) %description qt-devel %{summary}. +%endif %prep @@ -98,7 +106,9 @@ Requires: pkgconfig(Qt5Core) %build %{meson} \ -Dcompose=true \ +%if %{with qt} -Dqt=true \ +%endif -Dvapi=%{?vala:true}%{!?vala:false} %{meson_build} @@ -192,6 +202,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %dir %{_datadir}/gtk-doc/html/ %{_datadir}/gtk-doc/html/appstream-compose +%if %{with qt} %ldconfig_scriptlets qt %files qt @@ -202,9 +213,13 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_includedir}/AppStreamQt/ %{_libdir}/cmake/AppStreamQt/ %{_libdir}/libAppStreamQt.so +%endif %changelog +* Tue Sep 6 2022 Amit Shah - 0.15.5-2 +- Make qt deps and builds conditional + * Fri Sep 02 2022 Rex Dieter - 0.15.5-1 - 0.15.5 From 80cd8ad971e6cac312475d85b6329167c18ba6d2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 7 Oct 2022 11:02:34 +0200 Subject: [PATCH 13/37] Move qt bcond to the top of spec and document it --- appstream.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appstream.spec b/appstream.spec index c2b4c4b..3168b12 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,3 +1,5 @@ +# Enable Qt by default +%bcond qt 1 # Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) %global vala 1 @@ -13,8 +15,6 @@ License: GPLv2+ and LGPLv2+ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz -%bcond qt 1 - ## upstream patches (lookaside cache) ## upstreamable patches From 040978088676e22aafd812d6025a05f668611e98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:59:17 +0000 Subject: [PATCH 14/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 3168b12..0ed05b4 100644 --- a/appstream.spec +++ b/appstream.spec @@ -7,7 +7,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.15.5 -Release: 2%{?dist} +Release: 3%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -217,6 +217,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.15.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 6 2022 Amit Shah - 0.15.5-2 - Make qt deps and builds conditional From 8afa865225dfcb07f22220c6dc3c696d9727f673 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 11 Feb 2023 13:31:28 -0500 Subject: [PATCH 15/37] Update to 0.16.1 --- .gitignore | 1 + appstream.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 08273c0..6b6af69 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /AppStream-0.15.3.tar.xz /AppStream-0.15.4.tar.xz /AppStream-0.15.5.tar.xz +/AppStream-0.16.1.tar.xz diff --git a/appstream.spec b/appstream.spec index 0ed05b4..2496756 100644 --- a/appstream.spec +++ b/appstream.spec @@ -6,8 +6,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.15.5 -Release: 3%{?dist} +Version: 0.16.1 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -217,6 +217,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Sat Feb 11 2023 Neal Gompa - 0.16.1-1 +- Update to 0.16.1 + * Wed Jan 18 2023 Fedora Release Engineering - 0.15.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b199102..1b3b38f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.15.5.tar.xz) = 83202a8db9a31e4328b2a831b02e65389aad1ba95a4c2b2709084fb843cb3675af6fac73f932a31bb3a6d3ff5db85a863c01528be67d9bbd3b9614a978239771 +SHA512 (AppStream-0.16.1.tar.xz) = 79e139bd0f54534aa37c21d24309c33ee936e737149d6fa5ba0ec50e8ade33c2951d0b1e2ff15729e2a4d274ff1f7ca734bb70efa94539d87a3f949a07fb7d9e From 5147de2b575ad9b716859520da9126e7670119bb Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 11 Feb 2023 13:43:13 -0500 Subject: [PATCH 16/37] Add missing libsystemd BR --- appstream.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/appstream.spec b/appstream.spec index 2496756..31ba80c 100644 --- a/appstream.spec +++ b/appstream.spec @@ -37,6 +37,7 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(lmdb) BuildRequires: pkgconfig(packagekit-glib2) From 9a12b2c2784b61305b52003fee3bbb5256e3461f Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Sun, 2 Apr 2023 04:13:21 +0000 Subject: [PATCH 17/37] fix bcond to build under RHEL without error use %bcond_without instead of bcond qt 1 to fix build error in RHEL 9 --- appstream.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 31ba80c..82a6813 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,5 +1,5 @@ # Enable Qt by default -%bcond qt 1 +%bcond_without qt # Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) %global vala 1 From 45fad76d2b5be6c8fef2ac599825a0a7f4402530 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 19 Jun 2023 19:54:58 -0400 Subject: [PATCH 18/37] Disable Qt5 in RHEL 10 builds --- appstream.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appstream.spec b/appstream.spec index 82a6813..360ef12 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,5 +1,5 @@ -# Enable Qt by default -%bcond_without qt +# Enable Qt5 by default +%bcond qt %[%{undefined rhel} || 0%{?rhel} < 10] # Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) %global vala 1 @@ -7,7 +7,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.16.1 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -218,6 +218,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Mon Jun 19 2023 Yaakov Selkowitz - 0.16.1-2 +- Disable Qt5 in RHEL 10 builds + * Sat Feb 11 2023 Neal Gompa - 0.16.1-1 - Update to 0.16.1 From b6464f0b7f101c6dc0912d42295bdc39943e4cc6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 11 Jul 2023 21:21:29 -0400 Subject: [PATCH 19/37] Remove obsolete BuildRequires --- appstream.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/appstream.spec b/appstream.spec index 360ef12..b86aed1 100644 --- a/appstream.spec +++ b/appstream.spec @@ -35,14 +35,10 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(lmdb) -BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(protobuf-lite) %if %{with qt} BuildRequires: pkgconfig(Qt5Core) %endif @@ -220,6 +216,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog * Mon Jun 19 2023 Yaakov Selkowitz - 0.16.1-2 - Disable Qt5 in RHEL 10 builds +- Remove obsolete BuildRequires * Sat Feb 11 2023 Neal Gompa - 0.16.1-1 - Update to 0.16.1 From c49e5dc5c62f2903d3cd56a09bb8f70ba3a74688 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:34:48 +0000 Subject: [PATCH 20/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index b86aed1..d50ee35 100644 --- a/appstream.spec +++ b/appstream.spec @@ -7,7 +7,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.16.1 -Release: 2%{?dist} +Release: 3%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -214,6 +214,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 19 2023 Yaakov Selkowitz - 0.16.1-2 - Disable Qt5 in RHEL 10 builds - Remove obsolete BuildRequires From 3afecb931b57acffd4f6c59b8cccb75751015e80 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 21 Aug 2023 11:07:33 +0530 Subject: [PATCH 21/37] Migrate to SPDX license expression --- appstream.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/appstream.spec b/appstream.spec index d50ee35..1fbf5ce 100644 --- a/appstream.spec +++ b/appstream.spec @@ -7,10 +7,10 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.16.1 -Release: 3%{?dist} +Release: 4%{?dist} # lib LGPLv2+, tools GPLv2+ -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later #URL: http://www.freedesktop.org/wiki/Distributions/AppStream URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz @@ -214,6 +214,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Mon Aug 21 2023 Parag Nemade - 0.16.1-4 +- Migrate to SPDX license expression + * Wed Jul 19 2023 Fedora Release Engineering - 0.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 51384dca2599ac6ff1895beb927ceb6e28018adc Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 2 Nov 2023 21:22:14 -0400 Subject: [PATCH 22/37] Rebase to 1.0.0 git snapshot --- .gitignore | 1 + appstream.spec | 86 ++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 39 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 6b6af69..fcc810a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /AppStream-0.15.4.tar.xz /AppStream-0.15.5.tar.xz /AppStream-0.16.1.tar.xz +/appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz diff --git a/appstream.spec b/appstream.spec index 1fbf5ce..40d44c7 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,19 +1,19 @@ -# Enable Qt5 by default -%bcond qt %[%{undefined rhel} || 0%{?rhel} < 10] - -# Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often ) -%global vala 1 +%global basever 1.0.0 +%global commit d88ed03cb5b3b1803bdee3528c9b99d528ceb065 +%global commitdate 20231102 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.16.1 -Release: 4%{?dist} +Version: %{basever}%{?commitdate:~git%{commitdate}.%{shortcommit}} +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later #URL: http://www.freedesktop.org/wiki/Distributions/AppStream URL: https://github.com/ximion/appstream -Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz +Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz +%dnl Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz ## upstream patches (lookaside cache) @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gi-docgen) >= 2021.1 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libcurl) @@ -39,15 +40,11 @@ BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) -%if %{with qt} -BuildRequires: pkgconfig(Qt5Core) -%endif -BuildRequires: pkgconfig(xmlb) +BuildRequires: pkgconfig(Qt6Core) >= 6.2.4 +BuildRequires: pkgconfig(xmlb) >= 0.3.14 BuildRequires: pkgconfig(yaml-0.1) # lrelease -%if %{with qt} -BuildRequires: qt5-linguist -%endif +BuildRequires: qt6-linguist BuildRequires: sed BuildRequires: vala BuildRequires: xmlto @@ -80,9 +77,8 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description compose-devel %{summary}. -%if %{with qt} %package qt -Summary: Qt5 bindings for %{name} +Summary: Qt6 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description qt %{summary}. @@ -90,23 +86,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %package qt-devel Summary: Development files for %{name}-qt bindings Requires: %{name}-qt%{?_isa} = %{version}-%{release} -Requires: pkgconfig(Qt5Core) +Requires: pkgconfig(Qt6Core) >= 6.2.4 %description qt-devel %{summary}. -%endif %prep -%autosetup -n AppStream-%{version} -p1 +%autosetup -n %{name}-%{commit} -p1 +%dnl %autosetup -n AppStream-%{version} -p1 %build %{meson} \ -Dcompose=true \ -%if %{with qt} -Dqt=true \ -%endif - -Dvapi=%{?vala:true}%{!?vala:false} + -Dvapi=true %{meson_build} @@ -114,8 +108,8 @@ Requires: pkgconfig(Qt5Core) %install %{meson_install} -mkdir -p %{buildroot}/var/cache/app-info/{icons,gv,xmls} -touch %{buildroot}/var/cache/app-info/cache.watch +mkdir -p %{buildroot}/var/cache/swcatalog/{icons,gv,xml} +touch %{buildroot}/var/cache/swcatalog/cache.watch %find_lang appstream @@ -131,15 +125,14 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{meson_test} ||: -%ldconfig_scriptlets - %posttrans %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%transfiletriggerin -- %{_datadir}/app-info/xmls +%dnl %{_datadir}/app-info/xmls will get dropped before 1.0 final +%transfiletriggerin -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%transfiletriggerpostun -- %{_datadir}/app-info/xmls +%transfiletriggerpostun -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls %{_bindir}/appstreamcli refresh --force >& /dev/null ||: %files -f appstream.lang @@ -147,19 +140,19 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %license COPYING %{_bindir}/appstreamcli %{_mandir}/man1/appstreamcli.1* -%config(noreplace) %{_sysconfdir}/appstream.conf +%{_datadir}/appstream/ %dir %{_libdir}/girepository-1.0/ %{_libdir}/girepository-1.0/AppStream-1.0.typelib -%{_libdir}/libappstream.so.4* -%{_libdir}/libappstream.so.%{version} +%{_libdir}/libappstream.so.5 +%{_libdir}/libappstream.so.%{basever} %{_metainfodir}/org.freedesktop.appstream.cli.*.xml # put in -devel? -- rex %{_datadir}/gettext/its/metainfo.* -%ghost /var/cache/app-info/cache.watch -%dir /var/cache/app-info/ -%dir /var/cache/app-info/icons/ -%dir /var/cache/app-info/gv/ -%dir /var/cache/app-info/xmls/ +%ghost /var/cache/swcatalog/cache.watch +%dir /var/cache/swcatalog/ +%dir /var/cache/swcatalog/icons/ +%dir /var/cache/swcatalog/gv/ +%dir /var/cache/swcatalog/xml/ %files devel %{_includedir}/appstream/ @@ -167,12 +160,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_libdir}/pkgconfig/appstream.pc %dir %{_datadir}/gir-1.0/ %{_datadir}/gir-1.0/AppStream-1.0.gir -%if 0%{?vala} %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/appstream.deps %{_datadir}/vala/vapi/appstream.vapi -%endif %{_docdir}/appstream/html/ ## symlink pointing to ^^, but need to take care, since rpm has ## trouble replacing dirs with symlinks, omit it for now -- rex @@ -180,13 +171,11 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ # Maybe this should be split out? -- ngompa %{_datadir}/installed-tests/appstream/metainfo-validate.test -%ldconfig_scriptlets compose - %files compose %{_libexecdir}/appstreamcli-compose %{_mandir}/man1/appstreamcli-compose.1* -%{_libdir}/libappstream-compose.so.0* -%{_libdir}/libappstream-compose.so.%{version} +%{_libdir}/libappstream-compose.so.0 +%{_libdir}/libappstream-compose.so.%{basever} %{_libdir}/girepository-1.0/AppStreamCompose-1.0.typelib %{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml @@ -199,21 +188,20 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %dir %{_datadir}/gtk-doc/html/ %{_datadir}/gtk-doc/html/appstream-compose -%if %{with qt} -%ldconfig_scriptlets qt - %files qt -%{_libdir}/libAppStreamQt.so.2* -%{_libdir}/libAppStreamQt.so.%{version} +%{_libdir}/libAppStreamQt.so.3 +%{_libdir}/libAppStreamQt.so.%{basever} %files qt-devel %{_includedir}/AppStreamQt/ %{_libdir}/cmake/AppStreamQt/ %{_libdir}/libAppStreamQt.so -%endif %changelog +* Thu Nov 02 2023 Neal Gompa - 1.0.0~git20231102.d88ed03-1 +- Rebase to 1.0.0 git snapshot + * Mon Aug 21 2023 Parag Nemade - 0.16.1-4 - Migrate to SPDX license expression diff --git a/sources b/sources index 1b3b38f..831584b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.16.1.tar.xz) = 79e139bd0f54534aa37c21d24309c33ee936e737149d6fa5ba0ec50e8ade33c2951d0b1e2ff15729e2a4d274ff1f7ca734bb70efa94539d87a3f949a07fb7d9e +SHA512 (appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz) = 5d7ab98fb838a5c20f887852a4d20612d656a1eefc6c420822875a53cabcde1d00deabb7ec0d0ae7a585eec16bcd9c9d64887c8205d6423bc235d2c21af2a5c0 From b0770ee7d2a4d20013efa167ca62dfd81154562d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 17 Nov 2023 18:19:54 -0500 Subject: [PATCH 23/37] Update to 1.0.0 final --- .gitignore | 1 + ...potential-issue-where-stemmer-may-ne.patch | 88 +++++++++++++++++++ appstream.spec | 31 +++---- sources | 2 +- 4 files changed, 106 insertions(+), 16 deletions(-) create mode 100644 0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch diff --git a/.gitignore b/.gitignore index fcc810a..028d1da 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /AppStream-0.15.5.tar.xz /AppStream-0.16.1.tar.xz /appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz +/AppStream-1.0.0.tar.xz diff --git a/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch b/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch new file mode 100644 index 0000000..71b72e0 --- /dev/null +++ b/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch @@ -0,0 +1,88 @@ +From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Thu, 16 Nov 2023 00:59:15 +0100 +Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be + initialized + +If the initial locale was equal to the current stemming language, we may +never have initialized the stemmer (which could lead to crashes or +stemming being disabled). + +So we force the reload to always happen on initialization. +CC: #558 +--- + src/as-stemmer.c | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) + +diff --git a/src/as-stemmer.c b/src/as-stemmer.c +index 63d45267..16ebd09b 100644 +--- a/src/as-stemmer.c ++++ b/src/as-stemmer.c +@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) + + static gpointer as_stemmer_object = NULL; + ++static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); ++ + /** + * as_stemmer_finalize: + **/ +@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) + + /* we don't use the locale in XML, so it can be POSIX */ + locale = as_get_current_locale_posix (); +- stemmer->current_lang = as_utils_locale_to_language (locale); + +- as_stemmer_reload (stemmer, stemmer->current_lang); ++ /* force a reload for initialization */ ++ as_stemmer_reload_internal (stemmer, locale, TRUE); + #endif + } + +-/** +- * as_stemmer_reload: +- * @stemmer: A #AsStemmer +- * @locale: The stemming language as POSIX locale. +- * +- * Allows realoading the #AsStemmer with a different language. +- */ +-void +-as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) ++static void ++as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) + { + #ifdef HAVE_STEMMING + g_autofree gchar *lang = NULL; +@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) + /* check if we need to reload */ + lang = as_utils_locale_to_language (locale); + locker = g_mutex_locker_new (&stemmer->mutex); +- if (as_str_equal0 (lang, stemmer->current_lang)) { ++ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { + g_mutex_locker_free (locker); + return; + } +@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) + #endif + } + ++/** ++ * as_stemmer_reload: ++ * @stemmer: A #AsStemmer ++ * @locale: The stemming language as POSIX locale. ++ * ++ * Allows realoading the #AsStemmer with a different language. ++ * Does nothing if the stemmer is already using the selected language. ++ */ ++void ++as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) ++{ ++ as_stemmer_reload_internal (stemmer, locale, FALSE); ++} ++ + /** + * as_stemmer_stem: + * @stemmer: A #AsStemmer +-- +2.41.0 + diff --git a/appstream.spec b/appstream.spec index 40d44c7..54ea3ac 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,28 +1,26 @@ -%global basever 1.0.0 -%global commit d88ed03cb5b3b1803bdee3528c9b99d528ceb065 -%global commitdate 20231102 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: %{basever}%{?commitdate:~git%{commitdate}.%{shortcommit}} +Version: 1.0.0 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later #URL: http://www.freedesktop.org/wiki/Distributions/AppStream URL: https://github.com/ximion/appstream -Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz -%dnl Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz +Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz -## upstream patches (lookaside cache) +# upstream patches +## From: https://github.com/ximion/appstream/commit/32182d7a7a67d0d204cd0a37bd211bfd0177bc27 +Patch0001: 0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch + +# upstreamable patches -## upstreamable patches # needed for cmake auto-provides BuildRequires: cmake BuildRequires: meson >= 0.62 BuildRequires: gettext +BuildRequires: git-core BuildRequires: gperf BuildRequires: gtk-doc BuildRequires: intltool @@ -39,6 +37,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(Qt6Core) >= 6.2.4 BuildRequires: pkgconfig(xmlb) >= 0.3.14 @@ -92,8 +91,7 @@ Requires: pkgconfig(Qt6Core) >= 6.2.4 %prep -%autosetup -n %{name}-%{commit} -p1 -%dnl %autosetup -n AppStream-%{version} -p1 +%autosetup -n AppStream-%{version} -S git_am %build @@ -144,7 +142,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %dir %{_libdir}/girepository-1.0/ %{_libdir}/girepository-1.0/AppStream-1.0.typelib %{_libdir}/libappstream.so.5 -%{_libdir}/libappstream.so.%{basever} +%{_libdir}/libappstream.so.%{version} %{_metainfodir}/org.freedesktop.appstream.cli.*.xml # put in -devel? -- rex %{_datadir}/gettext/its/metainfo.* @@ -175,7 +173,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_libexecdir}/appstreamcli-compose %{_mandir}/man1/appstreamcli-compose.1* %{_libdir}/libappstream-compose.so.0 -%{_libdir}/libappstream-compose.so.%{basever} +%{_libdir}/libappstream-compose.so.%{version} %{_libdir}/girepository-1.0/AppStreamCompose-1.0.typelib %{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml @@ -190,7 +188,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %files qt %{_libdir}/libAppStreamQt.so.3 -%{_libdir}/libAppStreamQt.so.%{basever} +%{_libdir}/libAppStreamQt.so.%{version} %files qt-devel %{_includedir}/AppStreamQt/ @@ -199,6 +197,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Nov 17 2023 Neal Gompa - 1.0.0-1 +- Update to 1.0.0 final + * Thu Nov 02 2023 Neal Gompa - 1.0.0~git20231102.d88ed03-1 - Rebase to 1.0.0 git snapshot diff --git a/sources b/sources index 831584b..f04060e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz) = 5d7ab98fb838a5c20f887852a4d20612d656a1eefc6c420822875a53cabcde1d00deabb7ec0d0ae7a585eec16bcd9c9d64887c8205d6423bc235d2c21af2a5c0 +SHA512 (AppStream-1.0.0.tar.xz) = 273f1bbb64794691f04bee0cff782670465c6da238beec040af71a99395afdc8a85a6712c77777ff7c7ca872db6b2c8549782b7773d882e5ed7e9aa2a880f04c From 13cb273c6e282794d3854c76931a98f3694e6859 Mon Sep 17 00:00:00 2001 From: Steve Cossette Date: Wed, 3 Jan 2024 15:21:41 -0500 Subject: [PATCH 24/37] 1.0.1 --- .gitignore | 1 + ...potential-issue-where-stemmer-may-ne.patch | 88 ------------------- appstream.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 92 deletions(-) delete mode 100644 0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch diff --git a/.gitignore b/.gitignore index 028d1da..2ab5e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /AppStream-0.16.1.tar.xz /appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz /AppStream-1.0.0.tar.xz +/AppStream-1.0.1.tar.xz diff --git a/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch b/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch deleted file mode 100644 index 71b72e0..0000000 --- a/0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Thu, 16 Nov 2023 00:59:15 +0100 -Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be - initialized - -If the initial locale was equal to the current stemming language, we may -never have initialized the stemmer (which could lead to crashes or -stemming being disabled). - -So we force the reload to always happen on initialization. -CC: #558 ---- - src/as-stemmer.c | 33 +++++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 12 deletions(-) - -diff --git a/src/as-stemmer.c b/src/as-stemmer.c -index 63d45267..16ebd09b 100644 ---- a/src/as-stemmer.c -+++ b/src/as-stemmer.c -@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) - - static gpointer as_stemmer_object = NULL; - -+static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); -+ - /** - * as_stemmer_finalize: - **/ -@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) - - /* we don't use the locale in XML, so it can be POSIX */ - locale = as_get_current_locale_posix (); -- stemmer->current_lang = as_utils_locale_to_language (locale); - -- as_stemmer_reload (stemmer, stemmer->current_lang); -+ /* force a reload for initialization */ -+ as_stemmer_reload_internal (stemmer, locale, TRUE); - #endif - } - --/** -- * as_stemmer_reload: -- * @stemmer: A #AsStemmer -- * @locale: The stemming language as POSIX locale. -- * -- * Allows realoading the #AsStemmer with a different language. -- */ --void --as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+static void -+as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) - { - #ifdef HAVE_STEMMING - g_autofree gchar *lang = NULL; -@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - /* check if we need to reload */ - lang = as_utils_locale_to_language (locale); - locker = g_mutex_locker_new (&stemmer->mutex); -- if (as_str_equal0 (lang, stemmer->current_lang)) { -+ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { - g_mutex_locker_free (locker); - return; - } -@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - #endif - } - -+/** -+ * as_stemmer_reload: -+ * @stemmer: A #AsStemmer -+ * @locale: The stemming language as POSIX locale. -+ * -+ * Allows realoading the #AsStemmer with a different language. -+ * Does nothing if the stemmer is already using the selected language. -+ */ -+void -+as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+{ -+ as_stemmer_reload_internal (stemmer, locale, FALSE); -+} -+ - /** - * as_stemmer_stem: - * @stemmer: A #AsStemmer --- -2.41.0 - diff --git a/appstream.spec b/appstream.spec index 54ea3ac..147d3f5 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,6 +1,6 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -10,8 +10,7 @@ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz # upstream patches -## From: https://github.com/ximion/appstream/commit/32182d7a7a67d0d204cd0a37bd211bfd0177bc27 -Patch0001: 0001-stemmer-Resolve-potential-issue-where-stemmer-may-ne.patch + # upstreamable patches @@ -197,6 +196,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jan 03 2024 Steve Cossette - 1.0.1-1 +- Update to 1.0.1 + * Fri Nov 17 2023 Neal Gompa - 1.0.0-1 - Update to 1.0.0 final diff --git a/sources b/sources index f04060e..033330a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.0.tar.xz) = 273f1bbb64794691f04bee0cff782670465c6da238beec040af71a99395afdc8a85a6712c77777ff7c7ca872db6b2c8549782b7773d882e5ed7e9aa2a880f04c +SHA512 (AppStream-1.0.1.tar.xz) = 9e7d275910778ad119ac6029f61104619857a61582ec1022cea3a852cd8794b191aefadbde61d21801607ba5d5d0bed0e636ce8807af5c6d5b1e3c4c753842ab From 8523882051ccb5fc4eb10c499c27833f239f6082 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:23:16 +0000 Subject: [PATCH 25/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 147d3f5..f58d5b6 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -196,6 +196,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Steve Cossette - 1.0.1-1 - Update to 1.0.1 From 8d6bd9ad65d298daf66eadb94a8c50cf739faf47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:18:47 +0000 Subject: [PATCH 26/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index f58d5b6..cb8b8c8 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -196,6 +196,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cbd2eb94db83d3f8cc9daf12c8c1563235510b40 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 25 Feb 2024 07:33:24 -0500 Subject: [PATCH 27/37] Update to 1.0.2 Clean up some pre-1.0 scriptlet cruft --- .gitignore | 1 + appstream.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2ab5e0c..2427445 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz /AppStream-1.0.0.tar.xz /AppStream-1.0.1.tar.xz +/AppStream-1.0.2.tar.xz diff --git a/appstream.spec b/appstream.spec index cb8b8c8..9b5bc7a 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.0.2 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -125,11 +125,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %posttrans %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%dnl %{_datadir}/app-info/xmls will get dropped before 1.0 final -%transfiletriggerin -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls +%transfiletriggerin -- %{_datadir}/swcatalog/xml %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -%transfiletriggerpostun -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls +%transfiletriggerpostun -- %{_datadir}/swcatalog/xml %{_bindir}/appstreamcli refresh --force >& /dev/null ||: %files -f appstream.lang @@ -196,6 +195,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Sun Feb 25 2024 Neal Gompa - 1.0.2-1 +- Update to 1.0.2 +- Clean up some pre-1.0 scriptlet cruft + * Mon Jan 22 2024 Fedora Release Engineering - 1.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 033330a..6a8d58b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.1.tar.xz) = 9e7d275910778ad119ac6029f61104619857a61582ec1022cea3a852cd8794b191aefadbde61d21801607ba5d5d0bed0e636ce8807af5c6d5b1e3c4c753842ab +SHA512 (AppStream-1.0.2.tar.xz) = e5c109c383e3bf3af3693bfb3146663767c2c61fac0bd421f2ce52242fe7b869effeacc4d207987321dfeb4ab0ba77ece6c1c6eea054a7365204cd955426517a From 08051fd59455e9bd5bbaa4190796576afe8a6017 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sat, 9 Mar 2024 22:42:09 +0100 Subject: [PATCH 28/37] Backport patch to fix installing swcatalog --- appstream.spec | 7 +++++- ...yle-when-installing-catalog-metadata.patch | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 utils-explicitly-set-format-style-when-installing-catalog-metadata.patch diff --git a/appstream.spec b/appstream.spec index 9b5bc7a..c1a0c8f 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -10,6 +10,8 @@ URL: https://github.com/ximion/appstream Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz # upstream patches +# https://github.com/PackageKit/PackageKit/issues/720 +Patch0: utils-explicitly-set-format-style-when-installing-catalog-metadata.patch # upstreamable patches @@ -195,6 +197,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Sat Mar 09 2024 Alessandro Astone - 1.0.2-2 +- Backport patch to fix installing swcatalog + * Sun Feb 25 2024 Neal Gompa - 1.0.2-1 - Update to 1.0.2 - Clean up some pre-1.0 scriptlet cruft diff --git a/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch b/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch new file mode 100644 index 0000000..86f760d --- /dev/null +++ b/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch @@ -0,0 +1,23 @@ +From 36e54f831324c8ad441ef66b49b2149edd752ea9 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Sat, 9 Mar 2024 20:07:32 +0100 +Subject: [PATCH] utils: Explicitly set format style when installing catalog + metadata + +CC: https://github.com/PackageKit/PackageKit/issues/720 +--- + src/as-utils.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/as-utils.c b/src/as-utils.c +index 5efa237f..218f1774 100644 +--- a/src/as-utils.c ++++ b/src/as-utils.c +@@ -2481,6 +2481,7 @@ as_utils_install_metadata_file_internal (const gchar *filename, + if (origin != NULL && !is_yaml) { + g_autoptr(AsMetadata) mdata = as_metadata_new (); + as_metadata_set_locale (mdata, "ALL"); ++ as_metadata_set_format_style (mdata, AS_FORMAT_STYLE_CATALOG); + if (!as_metadata_parse_file (mdata, file_dest, AS_FORMAT_KIND_XML, error)) + return FALSE; + as_metadata_set_origin (mdata, origin); From fce2608dbeebf8ba443a97832430056034e9b1ae Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 5 Jul 2024 08:56:10 -0400 Subject: [PATCH 29/37] Disable stemming support on RHEL snowball/libstemmer is unwanted in RHEL; based on c10s: https://gitlab.com/redhat/centos-stream/rpms/appstream/-/commit/4abb7b1ce17c8213ce41a2a1f03f3c2dc847f0b3 --- appstream.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index c1a0c8f..e3a4673 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,7 +1,9 @@ +%bcond stemming %{undefined rhel} + Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -26,7 +28,9 @@ BuildRequires: gperf BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: itstool +%if %{with stemming} BuildRequires: libstemmer-devel +%endif BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) @@ -99,6 +103,7 @@ Requires: pkgconfig(Qt6Core) >= 6.2.4 %{meson} \ -Dcompose=true \ -Dqt=true \ + -Dstemming=%{?with_stemming:true}%{!?with_stemming:false} \ -Dvapi=true %{meson_build} @@ -197,6 +202,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Jul 05 2024 Yaakov Selkowitz - 1.0.2-3 +- Disable stemming support on RHEL + * Sat Mar 09 2024 Alessandro Astone - 1.0.2-2 - Backport patch to fix installing swcatalog From 67f0dd42cde61a5dc318b181291653f0efa3c916 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:16:43 +0000 Subject: [PATCH 30/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index e3a4673..9be8b16 100644 --- a/appstream.spec +++ b/appstream.spec @@ -3,7 +3,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -202,6 +202,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 05 2024 Yaakov Selkowitz - 1.0.2-3 - Disable stemming support on RHEL From fac24a11dc8f2eb2c5150f0c8c1edf63ff6a1fbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:21:57 +0000 Subject: [PATCH 31/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 9be8b16..7fb2b8d 100644 --- a/appstream.spec +++ b/appstream.spec @@ -3,7 +3,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.2 -Release: 4%{?dist} +Release: 5%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -202,6 +202,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9067fb39be34805f9120a05a9e0230ab0e3a3a70 Mon Sep 17 00:00:00 2001 From: Pavel Solovev Date: Sun, 19 Jan 2025 17:24:44 +0100 Subject: [PATCH 32/37] Update to 1.0.4 Try to fix tests Seems it was broken before (https://bodhi.fedoraproject.org/updates/FEDORA-2024-45f150d4b6), but there are no logs. --- .gitignore | 1 + appstream.spec | 12 +++++----- sources | 2 +- tests/test_appstream.py | 2 +- ...yle-when-installing-catalog-metadata.patch | 23 ------------------- 5 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 utils-explicitly-set-format-style-when-installing-catalog-metadata.patch diff --git a/.gitignore b/.gitignore index 2427445..e59912c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /AppStream-1.0.0.tar.xz /AppStream-1.0.1.tar.xz /AppStream-1.0.2.tar.xz +/AppStream-1.0.4.tar.xz diff --git a/appstream.spec b/appstream.spec index 7fb2b8d..07af2b2 100644 --- a/appstream.spec +++ b/appstream.spec @@ -2,19 +2,16 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.2 -Release: 5%{?dist} +Version: 1.0.4 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later #URL: http://www.freedesktop.org/wiki/Distributions/AppStream URL: https://github.com/ximion/appstream -Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz +Source0: https://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz # upstream patches -# https://github.com/PackageKit/PackageKit/issues/720 -Patch0: utils-explicitly-set-format-style-when-installing-catalog-metadata.patch - # upstreamable patches @@ -202,6 +199,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Sun Jan 19 2025 Pavel Solovev - 1.0.4-1 +- Update to 1.0.4 + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6a8d58b..834cce0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.2.tar.xz) = e5c109c383e3bf3af3693bfb3146663767c2c61fac0bd421f2ce52242fe7b869effeacc4d207987321dfeb4ab0ba77ece6c1c6eea054a7365204cd955426517a +SHA512 (AppStream-1.0.4.tar.xz) = ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1 diff --git a/tests/test_appstream.py b/tests/test_appstream.py index 00e014c..6642809 100644 --- a/tests/test_appstream.py +++ b/tests/test_appstream.py @@ -35,7 +35,7 @@ class TestAppstream(unittest.TestCase): 'Homepage: https://mike-fabian.github.io/ibus-typing-booster/' in output_lines) self.assertTrue( - 'Icon: ibus-typing-booster.png' + 'Icon: org.freedesktop.ibus.engine.typing_booster.emoji_picker.png' in output_lines) # This section not always there, better don’t test for this: # self.assertTrue( diff --git a/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch b/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch deleted file mode 100644 index 86f760d..0000000 --- a/utils-explicitly-set-format-style-when-installing-catalog-metadata.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 36e54f831324c8ad441ef66b49b2149edd752ea9 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Sat, 9 Mar 2024 20:07:32 +0100 -Subject: [PATCH] utils: Explicitly set format style when installing catalog - metadata - -CC: https://github.com/PackageKit/PackageKit/issues/720 ---- - src/as-utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/as-utils.c b/src/as-utils.c -index 5efa237f..218f1774 100644 ---- a/src/as-utils.c -+++ b/src/as-utils.c -@@ -2481,6 +2481,7 @@ as_utils_install_metadata_file_internal (const gchar *filename, - if (origin != NULL && !is_yaml) { - g_autoptr(AsMetadata) mdata = as_metadata_new (); - as_metadata_set_locale (mdata, "ALL"); -+ as_metadata_set_format_style (mdata, AS_FORMAT_STYLE_CATALOG); - if (!as_metadata_parse_file (mdata, file_dest, AS_FORMAT_KIND_XML, error)) - return FALSE; - as_metadata_set_origin (mdata, origin); From 42dfc7d455b24bd8b161c59cb3965f02fdfff40d Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" Date: Fri, 14 Mar 2025 22:00:25 +0000 Subject: [PATCH 33/37] Change appstream-data to a conditional Requires: --- appstream.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/appstream.spec b/appstream.spec index 07af2b2..5b24bd8 100644 --- a/appstream.spec +++ b/appstream.spec @@ -3,7 +3,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -50,7 +50,7 @@ BuildRequires: sed BuildRequires: vala BuildRequires: xmlto -Requires: appstream-data +Requires: (appstream-data if PackageKit) %description AppStream makes it easy to access application information from the @@ -199,6 +199,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Mar 14 2025 Shawn W. Dunn - 1.0.4-2 +- Change appstream-data to a conditional Requires: + * Sun Jan 19 2025 Pavel Solovev - 1.0.4-1 - Update to 1.0.4 From e3ca68296bf4193944eadeeb00d15aeed7e3d933 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:08:50 +0000 Subject: [PATCH 34/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index 5b24bd8..c85832e 100644 --- a/appstream.spec +++ b/appstream.spec @@ -3,7 +3,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -199,6 +199,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Mar 14 2025 Shawn W. Dunn - 1.0.4-2 - Change appstream-data to a conditional Requires: From 5620a67834c623613a14684b19c2eb38b5834ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 30 Jul 2025 17:20:48 +0400 Subject: [PATCH 35/37] Update to v1.0.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2362073 Signed-off-by: Marc-André Lureau --- .gitignore | 2 ++ appstream.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e59912c..5c6e55d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /AppStream-1.0.1.tar.xz /AppStream-1.0.2.tar.xz /AppStream-1.0.4.tar.xz +/AppStream-1.0.5.tar.xz +/AppStream-1.0.6.tar.xz diff --git a/appstream.spec b/appstream.spec index c85832e..ac991b2 100644 --- a/appstream.spec +++ b/appstream.spec @@ -2,8 +2,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.4 -Release: 3%{?dist} +Version: 1.0.6 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -199,6 +199,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Mon Aug 18 2025 Marc-André Lureau - 1.0.6-1 +- rebuilt + * Wed Jul 23 2025 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 834cce0..a0df17b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.4.tar.xz) = ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1 +SHA512 (AppStream-1.0.6.tar.xz) = a7a34ce2b37f7a3d9f22a69ff4a546d4fb33edaec4a303bd7541ede990d8a2c2a67d17f61c9cf09d75af277e308d21baaf42d6b968eca1a11d1df983a27e02a5 From 4fc81c785d937cf6fb663f85fa85c5e9df71016c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 26 Sep 2025 07:42:55 -0400 Subject: [PATCH 36/37] Update to 1.1.0 --- .gitignore | 1 + appstream.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5c6e55d..02dd8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /AppStream-1.0.4.tar.xz /AppStream-1.0.5.tar.xz /AppStream-1.0.6.tar.xz +/AppStream-1.1.0.tar.xz diff --git a/appstream.spec b/appstream.spec index ac991b2..b75d596 100644 --- a/appstream.spec +++ b/appstream.spec @@ -2,7 +2,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 1.0.6 +Version: 1.1.0 Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ @@ -36,6 +36,7 @@ BuildRequires: pkgconfig(gi-docgen) >= 2021.1 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libfyaml) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) @@ -199,6 +200,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Sep 26 2025 Neal Gompa - 1.1.0-1 +- Update to 1.1.0 + * Mon Aug 18 2025 Marc-André Lureau - 1.0.6-1 - rebuilt diff --git a/sources b/sources index a0df17b..dc574cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-1.0.6.tar.xz) = a7a34ce2b37f7a3d9f22a69ff4a546d4fb33edaec4a303bd7541ede990d8a2c2a67d17f61c9cf09d75af277e308d21baaf42d6b968eca1a11d1df983a27e02a5 +SHA512 (AppStream-1.1.0.tar.xz) = d775f3e1ed22cdedcdc12e103a35752f2cbb1700deb03118600a83a3fbf1489f34d62c833f5fc0279f40d9d8066a6cb2e6be358844adc366809777c5061c2342 From cb0aa66c0ff6b2b73e524748f200e3bfc46d0d18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:50:01 +0000 Subject: [PATCH 37/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- appstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appstream.spec b/appstream.spec index b75d596..486b97e 100644 --- a/appstream.spec +++ b/appstream.spec @@ -3,7 +3,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -200,6 +200,9 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 26 2025 Neal Gompa - 1.1.0-1 - Update to 1.1.0