From b402d2e40386cb24527a2fcdb3b85dce653be24e Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Apr 03 2019 21:56:03 +0000
Subject: Fix changelog entry for packages with more recent commits (profile 1)


---

diff --git a/go2rpm/templates/profile1.spec b/go2rpm/templates/profile1.spec
index 1000430..24c8cc9 100644
--- a/go2rpm/templates/profile1.spec
+++ b/go2rpm/templates/profile1.spec
@@ -155,12 +155,16 @@ ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{altipath{{ loop.index
 {% endif %}
 %changelog
 {% if auto_changelog_entry %}
-{% if version is none and tag is none %}
+{% if version is none and tag is none and commit is not none %}
 * {{ date }} {{ packager|default("go2rpm <nobody@fedoraproject.org>") }} - 0-{{ pkg_release }}.{{ shortdate }}git{{ shortcommit }}
-{% elif version is none and tag is not none %}
+{% elif version is none and tag is not none and commit is none %}
 * {{ date }} {{ packager|default("go2rpm <nobody@fedoraproject.org>") }} - {{ tag }}-{{ pkg_release }}
-{% else %}
+{% elif version is none and tag is not none and commit is not none %}
+* {{ date }} {{ packager|default("go2rpm <nobody@fedoraproject.org>") }} - {{ tag }}-{{ pkg_release }}.{{ shortdate }}git{{ shortcommit }}
+{% elif version is not none and tag is none and commit is none %}
 * {{ date }} {{ packager|default("go2rpm <nobody@fedoraproject.org>") }} - {{ version }}-{{ pkg_release }}
+{% elif version is not none and tag is none and commit is not none %}
+* {{ date }} {{ packager|default("go2rpm <nobody@fedoraproject.org>") }} - {{ version }}-{{ pkg_release }}.{{ shortdate }}git{{ shortcommit }}
 {% endif %}
 - Initial package
 {% endif %}