.gitignore

@@ -1 +1,42 @@
-SOURCES/flatpak-builder-1.2.3.tar.xz
+/flatpak-builder-0.9.9.tar.xz
+/flatpak-builder-0.9.11.tar.xz
+/flatpak-builder-0.9.98.tar.xz
+/flatpak-builder-0.9.99.tar.xz
+/flatpak-builder-0.10.0.tar.xz
+/flatpak-builder-0.10.1.tar.xz
+/flatpak-builder-0.10.2.tar.xz
+/flatpak-builder-0.10.3.tar.xz
+/flatpak-builder-0.10.4.tar.xz
+/flatpak-builder-0.10.5.tar.xz
+/flatpak-builder-0.10.6.tar.xz
+/flatpak-builder-0.10.7.tar.xz
+/flatpak-builder-0.10.8.tar.xz
+/flatpak-builder-0.10.9.tar.xz
+/flatpak-builder-0.10.10.tar.xz
+/flatpak-builder-0.99.1.tar.xz
+/flatpak-builder-0.99.2.tar.xz
+/flatpak-builder-0.99.3.tar.xz
+/flatpak-builder-1.0.0.tar.xz
+/flatpak-builder-1.0.1.tar.xz
+/flatpak-builder-1.0.2.tar.xz
+/flatpak-builder-1.0.3.tar.xz
+/flatpak-builder-1.0.4.tar.xz
+/flatpak-builder-1.0.5.tar.xz
+/flatpak-builder-1.0.7.tar.xz
+/flatpak-builder-1.0.9.tar.xz
+/flatpak-builder-1.0.10.tar.xz
+/flatpak-builder-1.0.12.tar.xz
+/flatpak-builder-1.0.14.tar.xz
+/flatpak-builder-1.1.1.tar.xz
+/flatpak-builder-1.1.2.tar.xz
+/flatpak-builder-1.2.0.tar.xz
+/flatpak-builder-1.2.1.tar.xz
+/flatpak-builder-1.2.2.tar.xz
+/flatpak-builder-1.2.3.tar.xz
+/flatpak-builder-1.3.1.tar.xz
+/flatpak-builder-1.3.2.tar.xz
+/flatpak-builder-1.3.3.tar.xz
+/flatpak-builder-1.3.4.tar.xz
+/flatpak-builder-1.3.5.tar.xz
+/flatpak-builder-1.4.0.tar.xz
+/flatpak-builder-1.4.1.tar.xz

SPECS/flatpak-builder.spec

@@ -1,118 +0,0 @@
-%global elf_version 0.8.12
-%global glib2_version 2.44
-%global libdw_version 0.172
-%global ostree_version 2017.14
-%global flatpak_version 0.99.1
-
-Name:           flatpak-builder
-Version:        1.2.3
-Release:        1%{?dist}
-Summary:        Tool to build flatpaks from source
-
-# src/builder-utils.c has portions derived from GPLv2+ code,
-# the rest is LGPLv2+
-License:        LGPLv2+ and GPLv2+
-URL:            http://flatpak.org/
-Source0:        https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz
-
-BuildRequires:  gettext
-BuildRequires:  docbook-dtds
-BuildRequires:  docbook-style-xsl
-BuildRequires:  flatpak >= %{flatpak_version}
-BuildRequires:  libcap-devel
-BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
-BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(libdw) >= %{libdw_version}
-BuildRequires:  pkgconfig(libelf) >= %{elf_version}
-BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
-BuildRequires:  pkgconfig(yaml-0.1)
-BuildRequires:  /usr/bin/xmlto
-BuildRequires:  /usr/bin/xsltproc
-
-Requires:       elfutils-libelf%{?_isa} >= %{elf_version}
-Requires:       elfutils-libs%{?_isa} >= %{libdw_version}
-Requires:       flatpak%{?_isa} >= %{flatpak_version}
-Requires:       glib2%{?_isa} >= %{glib2_version}
-Requires:       ostree-libs%{?_isa} >= %{ostree_version}
-Requires:       /usr/bin/bzip2
-%if ! 0%{?rhel} > 7
-# No bzr in latest RHEL
-Recommends:     /usr/bin/bzr
-%endif
-Requires:       /usr/bin/eu-strip
-Requires:       /usr/bin/git
-Requires:       /usr/bin/patch
-Requires:       /usr/bin/rofiles-fuse
-Requires:       /usr/bin/strip
-Recommends:     /usr/bin/svn
-Requires:       /usr/bin/tar
-Requires:       /usr/bin/unzip
-Recommends:     /usr/bin/zstd
-
-%description
-Flatpak-builder is a tool for building flatpaks from sources.
-
-See http://flatpak.org/ for more information.
-
-
-%prep
-%autosetup -p1
-
-
-%build
-%configure \
-    --enable-docbook-docs \
-    --with-fuse=2
-
-%make_build V=1
-
-
-%install
-%make_install
-
-
-%files
-%license COPYING
-%doc %{_pkgdocdir}
-%{_bindir}/flatpak-builder
-%{_libexecdir}/flatpak-builder-debugedit
-%{_mandir}/man1/flatpak-builder.1*
-%{_mandir}/man5/flatpak-manifest.5*
-
-
-%changelog
-* Wed Nov 08 2023 Debarshi Ray <rishi@fedoraproject.org> - 1.2.3-1
-- Rebase to 1.2.3 (RHEL-16011)
-
-* Fri Apr 01 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.0.14-2
-- Fix CVE-2022-21682 (#2042007)
-
-* Wed Mar 09 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.0.14-1
-- Update to 1.0.14 (#2047312)
-
-* Tue Feb 25 2020 David King <dking@redhat.com> - 1.0.9-3
-- Use elfutils instead of libdwarf (#1613030)
-
-* Fri Nov 08 2019 David King <dking@redhat.com> - 1.0.9-2
-- Drop Requires on lzip (#1748290)
-
-* Fri Nov 08 2019 David King <dking@redhat.com> - 1.0.9-1
-- Rebase to 1.0.9 (#1748290)
-
-* Tue Oct 16 2018 Kalev Lember <klember@redhat.com> - 1.0.1-2
-- Change svn requires to recommends (#1639355)
-
-* Thu Oct 04 2018 Kalev Lember <klember@redhat.com> - 1.0.1-1
-- Update to 1.0.1
-
-* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.0.0-1
-- Update to 1.0.0
-
-* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 0.99.3-2
-- Update license to "LGPLv2+ and GPLv2+"
-
-* Thu Aug 02 2018 David King <dking@redhat.com> - 0.99.3-1
-- Import from Fedora

flatpak-builder.spec

@@ -0,0 +1,314 @@
+%global appstream_version 0.15.0
+%global debugedit_version 5.0
+%global glib2_version 2.66
+%global ostree_version 2017.14
+%global flatpak_version 0.99.1
+
+Name:           flatpak-builder
+Version:        1.4.1
+Release:        3%{?dist}
+Summary:        Tool to build flatpaks from source
+
+# src/builder-utils.c has portions derived from GPLv2+ code,
+# the rest is LGPLv2+
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later
+URL:            https://flatpak.org/
+Source0:        https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz
+
+# ostree not on i686 for RHEL 10
+# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
+%if 0%{?rhel} >= 10
+ExcludeArch:    %{ix86}
+%endif
+
+BuildRequires:  appstream-compose >= %{appstream_version}
+BuildRequires:  gettext
+BuildRequires:  debugedit >= %{debugedit_version}
+BuildRequires:  docbook-dtds
+BuildRequires:  docbook-style-xsl
+BuildRequires:  flatpak >= %{flatpak_version}
+BuildRequires:  libcap-devel
+BuildRequires:  meson
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libelf)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
+BuildRequires:  pkgconfig(yaml-0.1)
+BuildRequires:  /usr/bin/xmlto
+BuildRequires:  /usr/bin/xsltproc
+
+Requires:       appstream-compose >= %{appstream_version}
+Requires:       debugedit >= %{debugedit_version}
+Requires:       flatpak%{?_isa} >= %{flatpak_version}
+Requires:       glib2%{?_isa} >= %{glib2_version}
+Requires:       ostree-libs%{?_isa} >= %{ostree_version}
+Requires:       /usr/bin/rofiles-fuse
+
+# Recommend various things that may or may not be needed depending on the code being built
+Recommends:     /usr/bin/bzip2
+Recommends:     /usr/bin/eu-strip
+Recommends:     /usr/bin/git
+Recommends:     /usr/bin/patch
+Recommends:     /usr/bin/strip
+Recommends:     /usr/bin/tar
+Recommends:     /usr/bin/unzip
+Recommends:     /usr/bin/zstd
+Recommends:     ccache
+
+# Uncommon enough that we don't want to pull them in by default
+#Recommends:     /usr/bin/brz
+#Recommends:     /usr/bin/lzip
+#Recommends:     /usr/bin/svn
+
+%description
+Flatpak-builder is a tool for building flatpaks from sources.
+
+See https://flatpak.org/ for more information.
+
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tests
+This package contains installed tests for %{name}.
+
+
+%prep
+%autosetup -p1
+
+
+%build
+%meson -Ddocs=enabled -Dfuse=3 -Dinstalled_tests=true -Dyaml=enabled
+%meson_build
+
+
+%install
+%meson_install
+install -pm 644 NEWS README.md %{buildroot}/%{_pkgdocdir}
+
+
+# %%check
+# %%meson_test
+
+
+%files
+%license COPYING
+%doc %{_pkgdocdir}
+%{_bindir}/flatpak-builder
+%{_mandir}/man1/flatpak-builder.1*
+%{_mandir}/man5/flatpak-manifest.5*
+
+%files tests
+%{_datadir}/installed-tests
+%{_libexecdir}/installed-tests
+
+
+%changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.4.1-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.4.1-2
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 08 2024 Kalev Lember <klember@redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 12 2023 Kalev Lember <klember@redhat.com> - 1.4.0-1
+- Update to 1.4.0
+
+* Sun Nov 19 2023 Kalev Lember <klember@redhat.com> - 1.3.5-1
+- Update to 1.3.5
+
+* Mon Nov 13 2023 Debarshi Ray <rishi@fedoraproject.org> - 1.3.4-1
+- Update to 1.3.4 (#2212349)
+- Enable installed tests
+- Disable %%check
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Mar 21 2023 David King <amigadave@amigadave.com> - 1.3.3-1
+- Update to 1.3.3 (#2179415)
+
+* Thu Feb 09 2023 David King <amigadave@amigadave.com> - 1.3.1-1
+- Update to 1.3.1 (#2159101)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Dec 26 2022 msuchy <msuchy@redhat.com> - 1.2.3-2
+- migrate to SPDX license
+
+* Tue Nov 29 2022 David King <amigadave@amigadave.com> - 1.2.3-1
+- Update to 1.2.3 (#2149163)
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 01 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.2.2-3
+- Work with both FUSE 2 and FUSE 3
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 19 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2
+
+* Wed Jan 19 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.2.1-2
+- Add 'Recommends: /usr/bin/zstd' to go with the new *.tar.zst support
+
+* Wed Jan 19 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1
+
+* Tue Oct 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0
+
+* Thu Sep 23 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2
+
+* Tue Aug 31 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1
+
+* Tue Aug 31 2021 Debarshi Ray <rishi@fedoraproject.org> - 1.0.14-1
+- Update to 1.0.14
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar 29 2021 Kalev Lember <klember@redhat.com> - 1.0.12-3
+- Remove bzr, lzip and svn recommends as they are not common enough
+
+* Thu Mar 25 2021 Kalev Lember <klember@redhat.com> - 1.0.12-2
+- Recommend all the archive handlers etc, instead of hard requiring
+
+* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 1.0.12-1
+- Update to 1.0.12
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 08 2020 Bastien Nocera <bnocera@redhat.com> - 1.0.10-3
++ flatpak-builder-1.0.10-3
+- Require ccache on Fedora where it is available
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Mar 20 2020 Kalev Lember <klember@redhat.com> - 1.0.10-1
+- Update to 1.0.10
+
+* Tue Feb 25 2020 David King <amigadave@amigadave.com> - 1.0.9-3
+- Use elfutils instead of libdwarf
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Sep 14 2019 David King <amigadave@amigadave.com> - 1.0.9-1
+- Update to 1.0.9
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 10 2019 Kalev Lember <klember@redhat.com> - 1.0.7-1
+- Update to 1.0.7
+
+* Fri Feb 08 2019 Kalev Lember <klember@redhat.com> - 1.0.5-1
+- Update to 1.0.5
+
+* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 1.0.4-1
+- Update to 1.0.4
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 30 2019 David King <amigadave@amigadave.com> - 1.0.3-2
+- Add dependency on lzip
+
+* Mon Jan 28 2019 David King <amigadave@amigadave.com> - 1.0.3-1
+- Update to 1.0.3
+
+* Tue Jan 15 2019 Kalev Lember <klember@redhat.com> - 1.0.2-1
+- Update to 1.0.2
+- Change bzr requires to recommends
+
+* Tue Oct 16 2018 Kalev Lember <klember@redhat.com> - 1.0.1-2
+- Change svn requires to recommends (#1639355)
+
+* Thu Oct 04 2018 Kalev Lember <klember@redhat.com> - 1.0.1-1
+- Update to 1.0.1
+
+* Mon Aug 20 2018 David King <amigadave@amigadave.com> - 1.0.0-1
+- Update to 1.0.0
+
+* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 0.99.3-4
+- Update license to "LGPLv2+ and GPLv2+"
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.99.3-3
+- Rebuild with fixed binutils
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Kalev Lember <klember@redhat.com> - 0.99.3-1
+- Update to 0.99.3
+
+* Wed Jun 27 2018 Kalev Lember <klember@redhat.com> - 0.99.2-1
+- Update to 0.99.2
+
+* Mon Jun 25 2018 David King <amigadave@amigadave.com> - 0.99.1-1
+- Update to 0.99.1
+
+* Fri Apr 27 2018 David King <amigadave@amigadave.com> - 0.10.10-2
+- Add some extra dependencies
+
+* Thu Apr 26 2018 Kalev Lember <klember@redhat.com> - 0.10.10-1
+- Update to 0.10.10
+
+* Mon Feb 19 2018 David King <amigadave@amigadave.com> - 0.10.9-1
+- Update to 0.10.9
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec 15 2017 Kalev Lember <klember@redhat.com> - 0.10.6-1
+- Update to 0.10.6
+
+* Tue Nov 28 2017 David King <amigadave@amigadave.com> - 0.10.5-1
+- Update to 0.10.5
+
+* Mon Nov 06 2017 Kalev Lember <klember@redhat.com> - 0.10.4-1
+- Update to 0.10.4
+
+* Tue Oct 31 2017 David King <amigadave@amigadave.com> - 0.10.3-1
+- Update to 0.10.3
+
+* Mon Oct 30 2017 David King <amigadave@amigadave.com> - 0.10.2-1
+- Update to 0.10.2
+
+* Fri Oct 27 2017 Kalev Lember <klember@redhat.com> - 0.10.1-1
+- Update to 0.10.1
+
+* Thu Oct 26 2017 Kalev Lember <klember@redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
+* Mon Oct 09 2017 Kalev Lember <klember@redhat.com> - 0.9.99-1
+- Update to 0.9.99
+
+* Mon Sep 25 2017 Kalev Lember <klember@redhat.com> - 0.9.98-1
+- Update to 0.9.98
+
+* Wed Sep 13 2017 Kalev Lember <klember@redhat.com> - 0.9.11-1
+- Update to 0.9.11
+
+* Mon Sep 04 2017 Kalev Lember <klember@redhat.com> - 0.9.9-1
+- Initial flatpak-builder package

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

sources

@@ -0,0 +1 @@
+SHA512 (flatpak-builder-1.4.1.tar.xz) = e9ffd09b2f077aa45da760049d2389eda44896c8476989a0ce1ead8c3a4feca409671cb5aabcdcee2632b58dd1c61a17aac4ac51536d1f94b0089a3d7ab689ee