From 578f2756df8d7820af5ae1ba016b78454dd35da5 Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Jun 04 2019 19:30:34 +0000 Subject: make it use the actual code that was merged in redhat-rpm-config-130 --- diff --git a/rpm/lua/srpm/go.lua b/rpm/lua/srpm/go.lua index c4c3446..457b8f1 100644 --- a/rpm/lua/srpm/go.lua +++ b/rpm/lua/srpm/go.lua @@ -245,7 +245,7 @@ local function singlepkg(kind, suffix, verbose) "BuildArch: noarch\n" .. "%{?currentgodevelheader}\n" .. "%description -n %{currentgodevelname}\n") .. - fedora.filterdescr("%{?currentgodeveldescription}") .. + fedora.wordwrap("%{?currentgodeveldescription}") .. "\n") elseif (kind == "alt") then local ismain = (suffix == "") or (suffix == "0") @@ -267,7 +267,7 @@ local function singlepkg(kind, suffix, verbose) "BuildArch: noarch\n" .. "%{?currentgoaltheader}\n" .. "%description -n %{currentgoaltname}\n") .. - fedora.filterdescr("%{?currentgoaltdescription}") .. + fedora.wordwrap("%{?currentgoaltdescription}") .. "\n") end else diff --git a/templates/rpm/spectemplate-go-0-source-minimal.spec b/templates/rpm/spectemplate-go-0-source-minimal.spec index c06a583..235a541 100644 --- a/templates/rpm/spectemplate-go-0-source-minimal.spec +++ b/templates/rpm/spectemplate-go-0-source-minimal.spec @@ -64,7 +64,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description # Generate package declarations for all known kinds of Go subpackages. # You can replace if with “godevelpkg” to generate Go devel subpackages only. diff --git a/templates/rpm/spectemplate-go-1-source-full.spec b/templates/rpm/spectemplate-go-1-source-full.spec index ce3f8b9..b93b754 100644 --- a/templates/rpm/spectemplate-go-1-source-full.spec +++ b/templates/rpm/spectemplate-go-1-source-full.spec @@ -84,7 +84,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description %gopkg diff --git a/templates/rpm/spectemplate-go-2-alternative-import-path-minimal.spec b/templates/rpm/spectemplate-go-2-alternative-import-path-minimal.spec index 5ca1241..b99ea43 100644 --- a/templates/rpm/spectemplate-go-2-alternative-import-path-minimal.spec +++ b/templates/rpm/spectemplate-go-2-alternative-import-path-minimal.spec @@ -43,7 +43,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description # Generate package declarations for all known kinds of Go subpackages. You can # replace if with separate “goaltpkg” and “godevelpkg” calls. diff --git a/templates/rpm/spectemplate-go-3-alternative-import-path-full.spec b/templates/rpm/spectemplate-go-3-alternative-import-path-full.spec index 93e9e31..7eb32bb 100644 --- a/templates/rpm/spectemplate-go-3-alternative-import-path-full.spec +++ b/templates/rpm/spectemplate-go-3-alternative-import-path-full.spec @@ -69,7 +69,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description %gopkg diff --git a/templates/rpm/spectemplate-go-4-binary-minimal.spec b/templates/rpm/spectemplate-go-4-binary-minimal.spec index 24916d9..66f4bdd 100644 --- a/templates/rpm/spectemplate-go-4-binary-minimal.spec +++ b/templates/rpm/spectemplate-go-4-binary-minimal.spec @@ -42,7 +42,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description %gopkg diff --git a/templates/rpm/spectemplate-go-5-binary-full.spec b/templates/rpm/spectemplate-go-5-binary-full.spec index e447a25..6c9550e 100644 --- a/templates/rpm/spectemplate-go-5-binary-full.spec +++ b/templates/rpm/spectemplate-go-5-binary-full.spec @@ -59,7 +59,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description %gopkg diff --git a/templates/rpm/spectemplate-go-6-multi.spec b/templates/rpm/spectemplate-go-6-multi.spec index 59f6bbb..652a3ee 100644 --- a/templates/rpm/spectemplate-go-6-multi.spec +++ b/templates/rpm/spectemplate-go-6-multi.spec @@ -132,7 +132,7 @@ Source0: %{gosource0} Source1: %{gosource1} # … %description -%filterdescr -v common_description +%wordwrap -v common_description # “gopkg” will generate all the subpackages package declarations corresponding # to the elements declared above. diff --git a/templates/rpm/spectemplate-go-7-manual.spec b/templates/rpm/spectemplate-go-7-manual.spec index 6b89094..ba8cfea 100644 --- a/templates/rpm/spectemplate-go-7-manual.spec +++ b/templates/rpm/spectemplate-go-7-manual.spec @@ -32,7 +32,7 @@ Summary: URL: %{gourl} Source0: %{gosource} %description -%filterdescr -v common_description +%wordwrap -v common_description %package -n %{goname}-devel Summary: %{summary}