#15 Two improvements
Merged 2 years ago by eclipseo. Opened 2 years ago by sixg0000d.
GoSIG/ sixg0000d/go2rpm master  into  master

file modified
+4 -9
@@ -660,15 +660,11 @@ 

          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_autorelease"] = "%autorelease -p"

+         kwargs["pkg_release"] = "0.1"

      else:

-         if kwargs["rpmautospec"]:

-             kwargs["pkg_release"] = "%autorelease"

-         else:

-             kwargs["pkg_release"] = "1%{?dist}"

+         kwargs["pkg_autorelease"] = "%autorelease"

+         kwargs["pkg_release"] = "1"

  

      kwargs["date"] = time.strftime("%a %b %d %Y")

      kwargs["shortdate"] = time.strftime("%Y%m%d")
@@ -691,7 +687,6 @@ 

      else:

          with open(spec_file, "w") as fobj:

              fobj.write(spec_contents)

-             fobj.write("\n")

  

  

  if __name__ == "__main__":

@@ -32,7 +32,11 @@ 

  {% if version is none and tag is none %}

  Version:        0

  {% endif %}

- Release:        {{ pkg_release }}

+ {% if rpmautospec %}

+ Release:        {{ pkg_autorelease }}

+ {% else %}

+ Release:        {{ pkg_release }}%{?dist}

+ {% endif %}

  Summary:        {{ summary|default("# FIXME") }}

  

  {% if licenses != license %}
@@ -159,7 +163,7 @@ 

  %changelog

  {% if rpmautospec %}

  %autochangelog

- {%- else %}

+ {% else %}

  {% if auto_changelog_entry %}

  {% 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 }}

@@ -37,7 +37,11 @@ 

  {% if version is none and tag is none %}

  Version:        0

  {% endif %}

- Release:        {{ pkg_release }}

+ {% if rpmautospec %}

+ Release:        {{ pkg_autorelease }}

+ {% else %}

+ Release:        {{ pkg_release }}%{?dist}

+ {% endif %}

  Summary:        {{ summary|default("# FIXME") }}

  

  {% if licenses != license %}
@@ -119,7 +123,7 @@ 

  %changelog

  {% if rpmautospec %}

  %autochangelog

- {%- else %}

+ {% else %}

  {% if auto_changelog_entry %}

  {% 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 }}

  1. Move dist tag from var pkg_release to templates, to remove dist tag from changelog
  2. If rpmautospec is enabled, there will be an unnecessary 2nd empty line at the end, try to avoid it.

Pull-Request has been closed by sixg0000d

2 years ago

Pull-Request has been reopened by sixg0000d

2 years ago

1 new commit added

  • Fix no new line when use autorelease
2 years ago

Pull-Request has been merged by eclipseo

2 years ago