From fe30064e6c6dca7814029efef825bb53cddd056d Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 20 Aug 2018 11:10:04 +0100 Subject: [PATCH] Update to 1.0.0 --- .gitignore | 1 + ...lnx.m4-Include-stdio.h-for-renameat2.patch | 29 ------------------- flatpak-builder.spec | 13 ++++----- sources | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 0001-libglnx.m4-Include-stdio.h-for-renameat2.patch diff --git a/.gitignore b/.gitignore index 12cf5e8..126b3e2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /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 diff --git a/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch b/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch deleted file mode 100644 index 1396a67..0000000 --- a/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7be25521cf639acc77ad8f968eb6c918533e94ec Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 11 Jul 2018 14:56:32 -0400 -Subject: [PATCH] libglnx.m4: Include stdio.h for renameat2 - -glibc added it upstream: -https://sourceware.org/git/?p=glibc.git;a=commit;h=d6da5cb6a8e0e8a9ce92b7d951a254cf325248d7 - -But we need the right header. -Ref: https://github.com/flatpak/flatpak/issues/1890 ---- - libglnx.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libglnx/libglnx.m4 b/libglnx.m4 -index 34caf20..5922805 100644 ---- a/libglnx/libglnx.m4 -+++ b/libglnx/libglnx.m4 -@@ -7,6 +7,7 @@ AC_CHECK_DECLS([ - [], [], [[ - #include - #include -+#include - #include - #include - #include --- -2.17.1 - diff --git a/flatpak-builder.spec b/flatpak-builder.spec index 8554c13..a302182 100644 --- a/flatpak-builder.spec +++ b/flatpak-builder.spec @@ -3,8 +3,8 @@ %global flatpak_version 0.99.1 Name: flatpak-builder -Version: 0.99.3 -Release: 4%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Tool to build flatpaks from source # src/builder-utils.c has portions derived from GPLv2+ code, @@ -13,9 +13,6 @@ License: LGPLv2+ and GPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz -# https://github.com/flatpak/flatpak/pull/1914 -Patch0: 0001-libglnx.m4-Include-stdio.h-for-renameat2.patch - BuildRequires: gettext BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl @@ -62,9 +59,6 @@ See http://flatpak.org/ for more information. %build -# For patch0 -autoreconf -fi - %configure \ --enable-docbook-docs \ --with-dwarf-header=%{_includedir}/libdwarf @@ -85,6 +79,9 @@ autoreconf -fi %changelog +* Mon Aug 20 2018 David King - 1.0.0-1 +- Update to 1.0.0 + * Mon Aug 13 2018 Kalev Lember - 0.99.3-4 - Update license to "LGPLv2+ and GPLv2+" diff --git a/sources b/sources index 3999bb8..2b66089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-builder-0.99.3.tar.xz) = aeb47bf4843fa8036ef0b795770de71facb4d92216b3886104e4c53ae312e6f97c6eef834ec35f5d174561c20f6933ac0a01ee19f206fb6e2bae59aaaf441bde +SHA512 (flatpak-builder-1.0.0.tar.xz) = d586e7e5eb82a84b0e80cd9a08d5a928bbd1eef3e8d1792f0922fb81d9d7df7179c474c133cec6b2e02e4fac21dac820e19f1f4d5b75e332b24b2d96b83f4e70