diff --git a/.gitignore b/.gitignore index 09974f6..5ce5a37 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /flatpak-builder-1.0.10.tar.xz /flatpak-builder-1.0.12.tar.xz /flatpak-builder-1.0.14.tar.xz +/flatpak-builder-1.2.2.tar.xz diff --git a/flatpak-builder-source-archive-source-file-Deprecate-MD5-and-SHA1-ha.patch b/flatpak-builder-source-archive-source-file-Deprecate-MD5-and-SHA1-ha.patch index e29de3f..6487958 100644 --- a/flatpak-builder-source-archive-source-file-Deprecate-MD5-and-SHA1-ha.patch +++ b/flatpak-builder-source-archive-source-file-Deprecate-MD5-and-SHA1-ha.patch @@ -1,4 +1,4 @@ -From 2e1efc8d31088fe9da93435d6a761afe37d1992d Mon Sep 17 00:00:00 2001 +From dfcc0717abaf30d1c0ac76becbe7e334b6a31a3e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 31 Jan 2022 15:16:12 +0100 Subject: [PATCH] source-archive, source-file: Deprecate MD5 and SHA1 hashes @@ -17,10 +17,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1935509 2 files changed, 24 insertions(+) diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c -index 245c7d40bf2e..7a9196723318 100644 +index c93f84efc84c..04eafe44cd01 100644 --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c -@@ -226,11 +226,23 @@ builder_source_archive_set_property (GObject *object, +@@ -230,11 +230,23 @@ builder_source_archive_set_property (GObject *object, case PROP_MD5: g_free (self->md5); self->md5 = g_value_dup_string (value); @@ -45,7 +45,7 @@ index 245c7d40bf2e..7a9196723318 100644 case PROP_SHA256: diff --git a/src/builder-source-file.c b/src/builder-source-file.c -index e4af408dc132..8b2efa643c84 100644 +index 715803d510bb..8a4077246cda 100644 --- a/src/builder-source-file.c +++ b/src/builder-source-file.c @@ -154,11 +154,23 @@ builder_source_file_set_property (GObject *object, diff --git a/flatpak-builder.spec b/flatpak-builder.spec index f590194..f3af153 100644 --- a/flatpak-builder.spec +++ b/flatpak-builder.spec @@ -1,10 +1,11 @@ +%global debugedit_version 5.0 %global glib2_version 2.44 %global ostree_version 2017.14 %global flatpak_version 0.99.1 Name: flatpak-builder -Version: 1.0.14 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: Tool to build flatpaks from source # src/builder-utils.c has portions derived from GPLv2+ code, @@ -17,11 +18,11 @@ Source0: https://github.com/flatpak/flatpak-builder/releases/download/%{v Patch0: flatpak-builder-source-archive-source-file-Deprecate-MD5-and-SHA1-ha.patch BuildRequires: gettext +BuildRequires: debugedit >= %{debugedit_version} BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: flatpak >= %{flatpak_version} BuildRequires: libcap-devel -BuildRequires: elfutils-devel BuildRequires: make BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -34,6 +35,7 @@ BuildRequires: pkgconfig(yaml-0.1) BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xsltproc +Requires: debugedit >= %{debugedit_version} Requires: flatpak%{?_isa} >= %{flatpak_version} Requires: glib2%{?_isa} >= %{glib2_version} Requires: ostree-libs%{?_isa} >= %{ostree_version} @@ -47,6 +49,7 @@ 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 @@ -66,7 +69,9 @@ See http://flatpak.org/ for more information. %build %configure \ - --enable-docbook-docs + --enable-docbook-docs \ + --with-fuse=2 \ + --with-system-debugedit %make_build V=1 @@ -84,6 +89,10 @@ See http://flatpak.org/ for more information. %changelog +* Mon Feb 07 2022 Debarshi Ray - 1.2.2-1 +- Rebase to 1.2.2 +Resolves: #1999742 + * Wed Feb 02 2022 Debarshi Ray - 1.0.14-2 - Deprecate MD5 and SHA1 hashes Resolves: #1935509 @@ -95,7 +104,7 @@ Resolves: #2006557 * Mon Aug 09 2021 Mohan Boddu - 1.0.12-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 - +< * Thu Apr 15 2021 Mohan Boddu - 1.0.12-4 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 742cb16..ceedfe1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-builder-1.0.14.tar.xz) = b49236f064aaa20357aa46db1671ae9d1237b402aa949c80886499c839aa404c2c9acb00be930e717bca48c7e7c3138ce6544e10db81bb7ed930abc1d3d57acf +SHA512 (flatpak-builder-1.2.2.tar.xz) = 28ab004f5c4fdb7f43b7d3f0823d54dad0aa4f660d5bbe9969e0ce011a1e338e2442e676d1d4c197af60d61a0911b8715ba34244b547116887bbcdef589e1b47