From d5f20d08198d5c5c7f28f8e93d44af1da939c511 Mon Sep 17 00:00:00 2001
From: sixg0000d <sixg0000d@gmail.com>
Date: Sep 04 2021 17:46:16 +0000
Subject: Remove dist tag from changelog


---

diff --git a/go2rpm/__main__.py b/go2rpm/__main__.py
index 81daa22..9113e83 100644
--- a/go2rpm/__main__.py
+++ b/go2rpm/__main__.py
@@ -660,15 +660,9 @@ def main():
         kwargs["auto_changelog_entry"] = True
 
     if version is None and tag is None:
-        if kwargs["rpmautospec"]:
-            kwargs["pkg_release"] = "%autorelease -p"
-        else:
-            kwargs["pkg_release"] = "0.1%{?dist}"
+        kwargs["pkg_release"] = "0.1"
     else:
-        if kwargs["rpmautospec"]:
-            kwargs["pkg_release"] = "%autorelease"
-        else:
-            kwargs["pkg_release"] = "1%{?dist}"
+        kwargs["pkg_release"] = "1"
 
     kwargs["date"] = time.strftime("%a %b %d %Y")
     kwargs["shortdate"] = time.strftime("%Y%m%d")
diff --git a/go2rpm/templates/profile1.spec b/go2rpm/templates/profile1.spec
index 79e8b3d..d23205e 100644
--- a/go2rpm/templates/profile1.spec
+++ b/go2rpm/templates/profile1.spec
@@ -32,7 +32,11 @@ Name:           %{goname}
 {% if version is none and tag is none %}
 Version:        0
 {% endif %}
-Release:        {{ pkg_release }}
+{% if rpmautospec %}
+Release:        %autorelease{% if version is none and tag is none %} -p{% endif %}
+{% else %}
+Release:        {{ pkg_release }}%{?dist}
+{% endif %}
 Summary:        {{ summary|default("# FIXME") }}
 
 {% if licenses != license %}
diff --git a/go2rpm/templates/profile2.spec b/go2rpm/templates/profile2.spec
index 159f46f..cfd3d96 100644
--- a/go2rpm/templates/profile2.spec
+++ b/go2rpm/templates/profile2.spec
@@ -37,7 +37,11 @@ Name:           %{goname}
 {% if version is none and tag is none %}
 Version:        0
 {% endif %}
-Release:        {{ pkg_release }}
+{% if rpmautospec %}
+Release:        %autorelease{% if version is none and tag is none %} -p{% endif %}
+{% else %}
+Release:        {{ pkg_release }}%{?dist}
+{% endif %}
 Summary:        {{ summary|default("# FIXME") }}
 
 {% if licenses != license %}