From 499768e8147ec3db31d3ac7d9e9cbb16878271c1 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 4 Feb 2022 14:58:06 -0500
Subject: [PATCH] Try: no conditional epoch

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 skopeo.spec | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/skopeo.spec b/skopeo.spec
index 344bc06..abdb2d4 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -20,11 +20,11 @@
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
 Name: %{repo}
-%if 0%{?fedora} && ! 0%{?rhel}
-Epoch: 1
-%else
+#%%if 0%%{?fedora} && ! 0%%{?rhel}
+#Epoch: 1
+%%else
 Epoch: 2
-%endif
+#%%endif
 Version: %{gen_version}
 Release: %autorelease
 Summary: Inspect container images and repositories on registries
@@ -45,22 +45,22 @@ BuildRequires: make
 Requires: containers-common >= 4:1-21
 # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
 # vendored libraries
-#Provides: bundled(golang(github.com/containers/common)) = v0.47.3
-#Provides: bundled(golang(github.com/containers/image/v5)) = v5.19.1
-#Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2
-#Provides: bundled(golang(github.com/containers/storage)) = v1.38.2
-#Provides: bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible
-#Provides: bundled(golang(github.com/dsnet/compress)) = v0.0.2_0.20210315054119_f66993602bf5
-#Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
-#Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84
-#Provides: bundled(golang(github.com/opencontainers/image_tools)) = v1.0.0_rc3
-#Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
-#Provides: bundled(golang(github.com/russross/blackfriday)) = v2.0.0+incompatible
-#Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
-#Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0
-#Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
-#Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0
-#Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
+Provides: bundled(golang(github.com/containers/common)) = v0.47.3
+Provides: bundled(golang(github.com/containers/image/v5)) = v5.19.1
+Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.2
+Provides: bundled(golang(github.com/containers/storage)) = v1.38.2
+Provides: bundled(golang(github.com/docker/docker)) = v20.10.12+incompatible
+Provides: bundled(golang(github.com/dsnet/compress)) = v0.0.2_0.20210315054119_f66993602bf5
+Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0
+Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20211202193544_a5463b7f9c84
+Provides: bundled(golang(github.com/opencontainers/image_tools)) = v1.0.0_rc3
+Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
+Provides: bundled(golang(github.com/russross/blackfriday)) = v2.0.0+incompatible
+Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
+Provides: bundled(golang(github.com/spf13/cobra)) = v1.3.0
+Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5
+Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.0
+Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635
 
 %description
 Command line utility to inspect images and repositories directly on Docker