diff --git a/SOURCES/1807.patch b/SOURCES/1807.patch
index 8cadfa9..dcfae56 100644
--- a/SOURCES/1807.patch
+++ b/SOURCES/1807.patch
@@ -274,4 +274,3 @@ index ce50db145..670c0fcba 100644
}
// Support on-demand socket activation by passing file descriptors into the container init process.
-
diff --git a/SPECS/runc.spec b/SPECS/runc.spec
index 48e142b..95e95f3 100644
--- a/SPECS/runc.spec
+++ b/SPECS/runc.spec
@@ -11,7 +11,7 @@
%if 0%{?rhel} > 7 && ! 0%{?fedora}
%define gobuild(o:) \
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
%endif # distro
%global provider github
@@ -19,36 +19,28 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
%global project opencontainers
%global repo runc
# https://github.com/opencontainers/runc
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global git0 https://github.com/opencontainers/runc
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global git0 https://%{import_path}
%global commit0 425e105d5a03fabd737a126ad93d62a9eeede87f
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: %{repo}
Version: 1.0.0
-Release: 56.rc8.dev.git%{shortcommit0}%{?dist}
+Release: 60.rc8%{?dist}
Summary: CLI for running Open Containers
ExcludeArch: %{ix86}
License: ASL 2.0
-URL: http//%{provider_prefix}
-Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
+URL: %{git0}
+Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
Source1: 99-containers.conf
-#Patch0: change-default-root.patch
-#Patch1: 0001-Revert-Apply-cgroups-earlier.patch
-Patch2: 1807.patch
-#Patch3: 0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b-runc.patch
-#Patch4: pivot-root.patch
-#Patch5: bz1743163.patch
-#Patch6: bz1743163-2.patch
-Requires: criu
-Requires(pre): container-selinux >= 2:2.2-2
-
+Patch0: 1807.patch
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2
BuildRequires: git
BuildRequires: go-md2man
BuildRequires: libseccomp-devel
+Requires: criu
+Requires(pre): container-selinux >= 2:2.2-2
%description
The runc command can be used to start containers which are packaged
@@ -99,8 +91,17 @@ install -p -m 0644 contrib/completions/bash/%{name} %{buildroot}%{_datadir}/bash
%{_datadir}/bash-completion/completions/%{name}
%changelog
-* Mon Aug 19 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-56.rc8.dev.git425e105
-- Resolves: #1743163
+* Mon Jun 17 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-60.rc8
+- Resolves: #1721247 - enable fips mode
+
+* Mon Jun 17 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-59.rc8
+- Resolves: #1720654 - rebase to v1.0.0-rc8
+
+* Thu Apr 11 2019 Eduardo Santiago <santiago@redhat.com> - 1.0.0-57.rc5.dev.git2abd837
+- Resolves: #1693424 - podman rootless: cannot specify gid= mount options
+
+* Wed Feb 27 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-56.rc5.dev.git2abd837
+- change-default-root patch not needed as there's no docker on rhel8
* Tue Feb 12 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-55.rc5.dev.git2abd837
- Resolves: CVE-2019-5736