diff --git a/.gitignore b/.gitignore index e266eb9..ae95308 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /flatpak-builder-0.9.9.tar.xz +/flatpak-builder-0.9.11.tar.xz diff --git a/0001-Add-back-accidentally-lost-flatpak_get_kernel_arch.patch b/0001-Add-back-accidentally-lost-flatpak_get_kernel_arch.patch deleted file mode 100644 index dfcc21e..0000000 --- a/0001-Add-back-accidentally-lost-flatpak_get_kernel_arch.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d69db55cae7206b032c6a787ca41603e0c8358ac Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Mon, 4 Sep 2017 12:18:22 +0200 -Subject: [PATCH] Add back accidentally lost flatpak_get_kernel_arch - -This fixes the build on ppc64le and various other arches. - -diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c -index da09eb8..ee4bd18 100644 ---- a/src/builder-flatpak-utils.c -+++ b/src/builder-flatpak-utils.c -@@ -201,6 +201,55 @@ flatpak_path_match_prefix (const char *pattern, - return NULL; /* Should not be reached */ - } - -+static const char * -+flatpak_get_kernel_arch (void) -+{ -+ static struct utsname buf; -+ static char *arch = NULL; -+ char *m; -+ -+ if (arch != NULL) -+ return arch; -+ -+ if (uname (&buf)) -+ { -+ arch = "unknown"; -+ return arch; -+ } -+ -+ /* By default, just pass on machine, good enough for most arches */ -+ arch = buf.machine; -+ -+ /* Override for some arches */ -+ -+ m = buf.machine; -+ /* i?86 */ -+ if (strlen (m) == 4 && m[0] == 'i' && m[2] == '8' && m[3] == '6') -+ { -+ arch = "i386"; -+ } -+ else if (g_str_has_prefix (m, "arm")) -+ { -+ if (g_str_has_suffix (m, "b")) -+ arch = "armeb"; -+ else -+ arch = "arm"; -+ } -+ else if (strcmp (m, "mips") == 0) -+ { -+#if G_BYTE_ORDER == G_LITTLE_ENDIAN -+ arch = "mipsel"; -+#endif -+ } -+ else if (strcmp (m, "mips64") == 0) -+ { -+#if G_BYTE_ORDER == G_LITTLE_ENDIAN -+ arch = "mips64el"; -+#endif -+ } -+ -+ return arch; -+} - - /* This maps the kernel-reported uname to a single string representing - * the cpu family, in the sense that all members of this family would --- -2.13.0 - diff --git a/flatpak-builder.spec b/flatpak-builder.spec index 5060d80..c152d6c 100644 --- a/flatpak-builder.spec +++ b/flatpak-builder.spec @@ -3,7 +3,7 @@ %global flatpak_version 0.9.9 Name: flatpak-builder -Version: 0.9.9 +Version: 0.9.11 Release: 1%{?dist} Summary: Tool to build flatpaks from source @@ -11,9 +11,6 @@ License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak-builder/releases/download/%{version}/%{name}-%{version}.tar.xz -# Fix the build on ppc64le -Patch0: 0001-Add-back-accidentally-lost-flatpak_get_kernel_arch.patch - BuildRequires: gettext BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl @@ -72,5 +69,8 @@ See http://flatpak.org/ for more information. %changelog +* Wed Sep 13 2017 Kalev Lember - 0.9.11-1 +- Update to 0.9.11 + * Mon Sep 04 2017 Kalev Lember - 0.9.9-1 - Initial flatpak-builder package diff --git a/sources b/sources index f8bbd9a..bcb9e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flatpak-builder-0.9.9.tar.xz) = 5260b241f2d919cb11111c66fa07c29a1c90d2307b64fd8ae2ba763cc5c9debddb4d58eef51e3b85f1d692bb27821d1763b31cc4b186bcfbe3573ac93cefc011 +SHA512 (flatpak-builder-0.9.11.tar.xz) = 6056fd8b797ba1bfdc07bbe757ff99a81a5cd6916fbc70cc0f2e30120718c27f2ff0ef24ad565a7044c343e4550131950e3338396b4ff47c3417bd7d5fc8d06e