From c996c1964d0e035ab8effa465dd1aaf5f2d48fd7 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 3 Dec 2020 11:46:11 -0500
Subject: [PATCH] podman-2:3.0.0-0.17.dev.git85b412d

- Harden binaries

Reported-by: Wade Mealing <wmealing@gmail.com>
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 podman.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/podman.spec b/podman.spec
index 8c32aa6..0ece946 100644
--- a/podman.spec
+++ b/podman.spec
@@ -56,7 +56,11 @@ Version: 3.0.0
 # N.foo if released, 0.N.foo if unreleased
 # Rawhide almost always ships unreleased builds,
 # so release tag should be of the form 0.N.foo
+<<<<<<< HEAD
 Release: 0.18.dev.git%{shortcommit0}%{?dist}
+=======
+Release: 0.17.dev.git%{shortcommit0}%{?dist}
+>>>>>>> be7c5c2 (podman-2:3.0.0-0.17.dev.git85b412d)
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
@@ -627,6 +631,10 @@ exit 0
 
 # rhcontainerbot account currently managed by lsm5
 %changelog
+* Thu Dec  3 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.0.0-0.17.dev.git85b412d
+- Harden binaries
+- Reported-by: Wade Mealing <wmealing@gmail.com>
+
 * Thu Dec  3 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:3.0.0-0.18.dev.git70284b1
 - autobuilt 70284b1