diff --git a/.gitignore b/.gitignore index 09974f6..6596d1a 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.1.1.tar.xz diff --git a/flatpak-builder-utils-Remove-unused-header.patch b/flatpak-builder-utils-Remove-unused-header.patch new file mode 100644 index 0000000..2a3970a --- /dev/null +++ b/flatpak-builder-utils-Remove-unused-header.patch @@ -0,0 +1,31 @@ +From ee8b921e9169e3f46a5e0e62b2bc583ecebdfe96 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Tue, 31 Aug 2021 18:20:25 +0200 +Subject: [PATCH] utils: Remove unused header + +The dwarf.h header is no longer used because the old in-tree +DWARF-parsing code was replaced by the standalone debugedit project +in commit bcced9e64535bf61. Hence, the build system was modified in +commit 1600dfb80be808a7 to no longer look for a dwarf.h header outside +the context of the standalone debugedit code. + +https://github.com/flatpak/flatpak-builder/pull/414 +--- + src/builder-utils.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/builder-utils.c b/src/builder-utils.c +index 38d3b642e5c2..865faf606865 100644 +--- a/src/builder-utils.c ++++ b/src/builder-utils.c +@@ -24,7 +24,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.31.1 + diff --git a/flatpak-builder.spec b/flatpak-builder.spec index b2e73dd..d677159 100644 --- a/flatpak-builder.spec +++ b/flatpak-builder.spec @@ -1,9 +1,10 @@ +%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 +Version: 1.1.1 Release: 1%{?dist} Summary: Tool to build flatpaks from source @@ -12,13 +13,14 @@ Summary: Tool to build flatpaks from source License: LGPLv2+ and GPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz +Patch0: %{name}-utils-Remove-unused-header.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) @@ -31,6 +33,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} @@ -63,7 +66,8 @@ See http://flatpak.org/ for more information. %build %configure \ - --enable-docbook-docs + --enable-docbook-docs \ + --with-system-debugedit %make_build V=1 @@ -81,6 +85,9 @@ See http://flatpak.org/ for more information. %changelog +* Tue Aug 31 2021 Debarshi Ray - 1.1.1-1 +- Update to 1.1.1 + * Tue Aug 31 2021 Debarshi Ray - 1.0.14-1 - Update to 1.0.14 diff --git a/sources b/sources index 742cb16..aa1dd4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-builder-1.0.14.tar.xz) = b49236f064aaa20357aa46db1671ae9d1237b402aa949c80886499c839aa404c2c9acb00be930e717bca48c7e7c3138ce6544e10db81bb7ed930abc1d3d57acf +SHA512 (flatpak-builder-1.1.1.tar.xz) = a9af47bf1f963ec4866590fed85ec98e7b4d5970c86b7337bdd44ff1632123fee47be500598b523bcd736389cbcc947aed59ce3111add1466525d01869499327