From 45f31da1097e32135cc642a66991d3426c018b83 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 25 2017 16:01:51 +0000
Subject: import ostree-2017.5-1.el7


---

diff --git a/.gitignore b/.gitignore
index e9e9003..27bd587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libostree-2017.3.tar.xz
+SOURCES/libostree-2017.5.tar.xz
diff --git a/.ostree.metadata b/.ostree.metadata
index 58f4312..4c4b621 100644
--- a/.ostree.metadata
+++ b/.ostree.metadata
@@ -1 +1 @@
-439fa38167fd4b722b69a8f29f14bb277f8a11e7 SOURCES/libostree-2017.3.tar.xz
+2ccf27f11bf93a9369dab6210727a51f08fef178 SOURCES/libostree-2017.5.tar.xz
diff --git a/SOURCES/0001-unlock-backport-sepolicy-fix.patch b/SOURCES/0001-unlock-backport-sepolicy-fix.patch
deleted file mode 100644
index 064bdd5..0000000
--- a/SOURCES/0001-unlock-backport-sepolicy-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1abef6b50970ab627019f04f269176e03edbae08 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jlebon@redhat.com>
-Date: Wed, 29 Mar 2017 11:00:11 -0400
-Subject: [PATCH] unlock: backport sepolicy fix
-
-This patch backports https://github.com/ostreedev/ostree/pull/763 to the
-v2017.3 release. Rather than backporting all the new sepolicy stuff, I
-reworked it in the style of yore.
----
- src/libostree/ostree-sysroot.c | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
-index f50e34b..0365624 100644
---- a/src/libostree/ostree-sysroot.c
-+++ b/src/libostree/ostree-sysroot.c
-@@ -25,6 +25,7 @@
- #include <sys/wait.h>
- 
- #include "ostree-core-private.h"
-+#include "ostree-sepolicy.h"
- #include "ostree-sysroot-private.h"
- #include "ostree-deployment-private.h"
- #include "ostree-bootloader-uboot.h"
-@@ -1699,6 +1700,7 @@ ostree_sysroot_deployment_unlock (OstreeSysroot     *self,
-   g_autofree char *deployment_path = NULL;
-   glnx_fd_close int deployment_dfd = -1;
-   pid_t mount_child;
-+  glnx_unref_object OstreeSePolicy *sepolicy = NULL;
- 
-   /* This function cannot re-lock */
-   g_return_val_if_fail (unlocked_state != OSTREE_DEPLOYMENT_UNLOCKED_NONE, FALSE);
-@@ -1735,6 +1737,13 @@ ostree_sysroot_deployment_unlock (OstreeSysroot     *self,
-   if (!glnx_opendirat (self->sysroot_fd, deployment_path, TRUE, &deployment_dfd, error))
-     goto out;
- 
-+  { g_autofree char *abspath = glnx_fdrel_abspath (deployment_dfd, ".");
-+    g_autoptr(GFile) path = g_file_new_for_path (abspath);
-+    sepolicy = ostree_sepolicy_new (path, cancellable, error);
-+    if (!sepolicy)
-+      goto out;
-+  }
-+
-   switch (unlocked_state)
-     {
-     case OSTREE_DEPLOYMENT_UNLOCKED_NONE:
-@@ -1762,8 +1771,18 @@ ostree_sysroot_deployment_unlock (OstreeSysroot     *self,
-         const char *development_ovl_upper;
-         const char *development_ovl_work;
- 
--        if (!glnx_mkdtempat (AT_FDCWD, development_ovldir, 0700, error))
--          goto out;
-+        /* Ensure that the directory is created with the same label as `/usr` */
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-variable"
-+        { ostree_cleanup_sepolicy_fscreatecon gpointer dummy = NULL;
-+#pragma GCC diagnostic pop
-+
-+          if (!ostree_sepolicy_setfscreatecon (sepolicy, "/usr", 0755, error))
-+            goto out;
-+
-+          if (!glnx_mkdtempat (AT_FDCWD, development_ovldir, 0755, error))
-+            goto out;
-+        }
- 
-         development_ovl_upper = glnx_strjoina (development_ovldir, "/upper");
-         if (!glnx_shutil_mkdir_p_at (AT_FDCWD, development_ovl_upper, 0755, cancellable, error))
--- 
-2.10.2
-
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index 2acf3c1..22c283b 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -1,13 +1,12 @@
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2017.3
-Release: 2%{?dist}
+Version: 2017.5
+Release: 1%{?dist}
 #VCS: git:https://github.com/ostreedev/ostree
 # The source tarball is generated via make -C packaging dist-snapshot
 # which handles git submodules.
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 Source1: 91-ostree.preset
-Patch0: 0001-unlock-backport-sepolicy-fix.patch
 License: LGPLv2+
 URL: https://github.com/ostreedev/ostree
 
@@ -55,14 +54,20 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 The %{name}-devel package includes the header files for the %{name} library.
 
+%ifnarch s390 s390x %{arm}
 %package grub2
 Summary: GRUB2 integration for OSTree
 Group: Development/Libraries
+%ifnarch aarch64
 Requires: grub2
+%else
+Requires: grub2-efi
+%endif
 Requires: ostree
 
 %description grub2
 GRUB2 integration for OSTree
+%endif
 
 %package fuse
 Summary: FUSE utilities for ostree
@@ -109,6 +114,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/girepository-1.0/OSTree-1.0.typelib
 %{_mandir}/man*/*.gz
 %{_prefix}/lib/systemd/system-preset/91-ostree.preset
+%exclude %{_sysconfdir}/grub.d/*ostree
+%exclude %{_libexecdir}/libostree/grub2*
 %{_prefix}/lib/ostree/ostree-prepare-root
 %{_prefix}/lib/ostree/ostree-remount
 %{_libexecdir}/libostree/*
@@ -131,7 +138,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Mar 29 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.3.2
+* Mon May 01 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.5-1
+- New release
+  Resolves: #1447077
+
+* Thu Apr 06 2017 David Marlin <dmarlin@redhat.com> - 2017.3-3
+- Patch spec to get non-grub archs working again
+  Resolves: #1439395
+
+* Wed Mar 29 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.3-2
 - Backport fix for ovl selinux labeling
   Resolves: #1436751