Tweak subpackage naming and descriptions

go-rpm-macros-epel.spec

@@ -4,7 +4,6 @@
 # SPDX-FileCopyrightText: 2022 Maxwell G <gotmax@e.email>
 # SPDX-FileCopyrightText: Fedora Project Authors
 
-%global _docdir_fmt %{name}
 # Pagure does not support downloading raw files of tags.
 # Referencing the commit hash is necessary
 %dnl %global upstream_version 3.2.0
@@ -37,7 +36,7 @@ Requires:       go-srpm-macros-epel = %{version}-%{release}
 Requires:       /usr/bin/golist
 
 %description
-This package contains backports of certain Go RPM macros from Fedora.
+go-rpm-macros-epel contains backports of certain Go RPM macros from Fedora.
 
 
 %package -n     go-srpm-macros-epel
@@ -45,21 +44,22 @@ Summary:        Backport of certain Go SRPM macros from Fedora
 BuildArch:      noarch
 
 %description -n go-srpm-macros-epel
-This package contains backports of certain Go SRPM macros from Fedora.
+go-srpm-macros-epel contains backports of certain Go SRPM macros from Fedora.
 
 
-%package        golist-symlink
+%package -n     go-rpm-macros-golist-symlink
 Summary:        Provides symlink to the bundled golist in go-rpm-macros
 # The package just provides a symlink.
 License:        Unlicense
+# Conflict with standard golist in case that gets packaged.
+Conflicts:      golist
 Requires:       go-rpm-macros
 
-%description    golist-symlink
-This package provides symlink to the bundled golist in go-rpm-macros
-
-RHEL's go-rpm-macros package bundled a modified golist and installs it to
-%{_libexecdir}/go-rpm-macros. However, the macros expect it to be installed in
-%{_bindir}.
+%description    -n go-rpm-macros-golist-symlink
+go-rpm-macros-golist-symlink provides a symlink from /usr/bin to
+go-rpm-macros's bundled golist, which is installed in
+/usr/libexec/go-rpm-macros. This allows the macros that expect to find golist
+in $PATH to work properly.
 
 This package is split out and namespaced to allow the upstream golist to be
 packaged as golist.