diff --git a/0001-32-bit-fixes.patch b/0001-32-bit-fixes.patch deleted file mode 100644 index 6ff2e1c..0000000 --- a/0001-32-bit-fixes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From efd2345b347d05fc0e6893194b53e718324731e7 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 8 Jan 2015 16:16:21 -0500 -Subject: [PATCH] 32 bit fixes - ---- - src/libostree/ostree-repo-pull.c | 2 +- - src/libostree/ostree-repo-static-delta-compilation.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c -index a6160d3..4732811 100644 ---- a/src/libostree/ostree-repo-pull.c -+++ b/src/libostree/ostree-repo-pull.c -@@ -1847,7 +1847,7 @@ ostree_repo_pull_with_options (OstreeRepo *self, - - if (pull_data->summary) - { -- guint64 commit_size = 0; -+ gsize commit_size = 0; - guint64 *malloced_size; - - if (!lookup_commit_checksum_from_summary (pull_data, branch, &contents, &commit_size, error)) -diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c -index 24fe8f4..3fb6970 100644 ---- a/src/libostree/ostree-repo-static-delta-compilation.c -+++ b/src/libostree/ostree-repo-static-delta-compilation.c -@@ -548,8 +548,8 @@ ostree_repo_static_delta_generate (OstreeRepo *self, - - g_printerr ("part %u n:%u compressed:%" G_GUINT64_FORMAT " uncompressed:%" G_GUINT64_FORMAT "\n", - i, part_builder->objects->len, -- g_variant_get_size (delta_part), -- part_builder->uncompressed_size); -+ (guint64)g_variant_get_size (delta_part), -+ (guint64)part_builder->uncompressed_size); - } - - descriptor_relpath = _ostree_get_relative_static_delta_path (from, to); --- -1.8.3.1 - diff --git a/0001-sysroot-Close-sysroot-fd-in-finalize.patch b/0001-sysroot-Close-sysroot-fd-in-finalize.patch deleted file mode 100644 index 0905db9..0000000 --- a/0001-sysroot-Close-sysroot-fd-in-finalize.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f08cb802ea1b02c874fd71a0672c28b49e890d49 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Sun, 19 Apr 2015 15:25:05 -0400 -Subject: [PATCH] sysroot: Close sysroot fd in finalize - -Just noticed this while I was going to add another one there. ---- - src/libostree/ostree-sysroot.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c -index b18c6b7..6255803 100644 ---- a/src/libostree/ostree-sysroot.c -+++ b/src/libostree/ostree-sysroot.c -@@ -66,6 +66,9 @@ ostree_sysroot_finalize (GObject *object) - g_clear_object (&self->sepolicy); - g_clear_object (&self->repo); - -+ if (self->sysroot_fd != -1) -+ (void) close (self->sysroot_fd); -+ - G_OBJECT_CLASS (ostree_sysroot_parent_class)->finalize (object); - } - --- -1.8.3.1 - diff --git a/ostree.spec b/ostree.spec index 9e50942..9497c4f 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,12 +1,10 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2015.6 -Release: 4%{?dist} +Version: 2015.7 +Release: 1%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/ostree-%{version}.tar.xz Source1: 91-ostree.preset -Patch0: 0001-sysroot-Close-sysroot-fd-in-finalize.patch -Patch1: PR116.patch License: LGPLv2+ URL: http://live.gnome.org/OSTree @@ -120,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 02 2015 Colin Walters - 2015.7-1 +- New upstream version + * Thu May 28 2015 Colin Walters - 2015.6-4 - Add patch to ensure reliable bootloader ordering See: #1225088