From a16302313a2587cacffa9a4e51a690b19655aea4 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 16 Aug 2021 15:03:14 -0400
Subject: [PATCH] conmon-2:2.0.29-2

- build correct tag lol

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore  |  2 ++
 conmon.spec | 30 +++++++++++-------------------
 sources     |  2 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c481f1..ee22493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,5 @@
 /conmon-75e067e.tar.gz
 /conmon-24c73c2.tar.gz
 /conmon-1ef2468.tar.gz
+/7381063391d2071a3d27a6e80c9c84d741fb4221.tar.gz
+/v2.0.29.tar.gz
diff --git a/conmon.spec b/conmon.spec
index e5187f1..02beea6 100644
--- a/conmon.spec
+++ b/conmon.spec
@@ -8,30 +8,19 @@
 %global debug_package %{nil}
 %endif
 
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo conmon
-# https://github.com/containers/conmon
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 2947bb2e8c3a1b1ed4dd61c66c4f6f814aff67e6
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global git0 https://%{import_path}
-
 # Used for comparing with latest upstream tag
-# to decide whether to autobuild and set download_url (non-rawhide only)
-%define built_tag v2.0.29
-%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
-%define download_url %{git0}/archive/%{built_tag}.tar.gz
+# to decide whether to autobuild
+%global built_tag v2.0.29
+%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 
-Name: %{repo}
+Name: conmon
 Epoch: 2
 Version: 2.0.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: OCI container runtime monitor
 License: ASL 2.0
-URL: %{git0}
-Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+URL: https://github.com/containers/conmon
+Source0: %{url}/archive/%{built_tag}.tar.gz
 BuildRequires: gcc
 BuildRequires: git
 BuildRequires: glib2-devel
@@ -46,7 +35,7 @@ Requires: systemd-libs
 %{summary}.
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 
@@ -70,6 +59,9 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Mon Aug 16 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.29-2
+- build correct tag lol
+
 * Mon Aug 16 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.29-1
 - autobuilt v2.0.29
 
diff --git a/sources b/sources
index 030b8bc..a4104d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conmon-2947bb2.tar.gz) = 27072cf06fbb0b3cdf11bc41451523396649b4c36b7e2d108d69934de63a189197f10b9659b9c057d3d9a4e4686aa8cf56ac49bb3f7e22186fc853152443586d
+SHA512 (v2.0.29.tar.gz) = 0eec0322ee209efacae93b6e96c3bea2468a309d6211c8c047b49fa3bd8b5d1a198a16b3ff1ffe629dc37a12e2e0db1979e8876833c5cef0f69be35d4be8b550