#91 Fix PR 83
Merged 3 years ago by ignatenkobrain. Opened 3 years ago by nim.
rpms/ nim/redhat-rpm-config finish-new_package-backport  into  master

file modified
+3 -3
@@ -231,7 +231,7 @@ 

  %description

  %wordwrap -v source_description

  ]]))

-   set("currentname", "%{source_name}", verbose)

+   explicitset("currentname", "%{source_name}", verbose)

  end

  

  -- %new_package core
@@ -257,7 +257,7 @@ 

    end

    if name_suffix then

      print(rpm.expand("%package        "  .. name_suffix))

-     set("currentname", "%{source_name}-" .. name_suffix, verbose)

+     explicitset("currentname", "%{source_name}-" .. name_suffix, verbose)

    else

      if not source_name then

        source_name = pkg_name
@@ -271,7 +271,7 @@ 

        end

        print(rpm.expand("%package     -n " .. pkg_name))

      end

-     set("currentname", pkg_name, verbose)

+     explicitset("currentname", pkg_name, verbose)

    end

  end

  

file modified
+1 -1
@@ -210,7 +210,7 @@ 

  - When LTO is enabled, fix broken configure files.

  

  * Sat May 30 2020 Nicolas Mailhot <nim@fedoraproject.org> - 156-1

- - Add %new_package macro and associated lua framework.

+ - Add new_package macro and associated lua framework.

  

  * Sat May 23 2020 Nicolas Mailhot <nim@fedoraproject.org> - 155-1

  - forge: add gitea support

@tibbs:

https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/83 had been left to cook too long, and in the end required backporting future state, except the backport missed changing back some future API calls, so the result does not work.

You can either apply this PR with the trivial API call fix, or skip directly to
https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/90

that contains the rest of the changes the original backport was taken from.

The limited version in this PR is shown working on

https://copr.fedorainfracloud.org/coprs/nim/redhat-rpm-config-156-fonts-rpm-macros-4.0.2/builds/

rebased onto fff16e5

3 years ago

Pull-Request has been merged by ignatenkobrain

3 years ago
Metadata