Notification time stamped 2021-04-30 14:34:23 UTC
From 63e7be2dbee01001ebd01a2c720ef1f84699adad Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: omit trailing slash from ansible_collection_files
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index d147049..5a11d6a 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -47,7 +47,7 @@ License: GPLv3+ and MIT and BSD
# Not used (yet). Could be made to point to AH in RHEL - but what about CentOS Stream?
#%%{!?ansible_collection_url:%%define ansible_collection_url()
https://galaxy.ansible.com/%%{collection_namespace}/%%{collection_name}}
-%{!?ansible_collection_files:%define ansible_collection_files
%{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
+%{!?ansible_collection_files:%define ansible_collection_files
%{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}}
%if %{with ansible}
BuildRequires: ansible >= 2.9.10
@@ -62,7 +62,7 @@ BuildRequires: ansible >= 2.9.10
%if %{without ansible}
# Simply copy everything instead of galaxy-installing the built artifact.
-%define ansible_collection_install() mkdir -p
%{buildroot}%{ansible_collection_files}/%{collection_name}; (cd
%{buildroot}%{ansible_collection_files}%{collection_name}; tar -xf
%{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz)
+%define ansible_collection_install() mkdir -p
%{buildroot}%{ansible_collection_files}/%{collection_name}; (cd
%{buildroot}%{ansible_collection_files}/%{collection_name}; tar -xf
%{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz)
%else
%define ansible_collection_install() ansible-galaxy collection install -n -p
%{buildroot}%{_datadir}/ansible/collections
%{collection_namespace}-%{collection_name}-%{version}.tar.gz
%endif
@@ -431,20 +431,20 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/collection
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles
-cp -p %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \
- %{buildroot}%{ansible_collection_files}%{collection_name}/README.html \
+cp -p %{buildroot}%{ansible_collection_files}/%{collection_name}/README.md \
+ %{buildroot}%{ansible_collection_files}/%{collection_name}/README.html \
$RPM_BUILD_ROOT%{_pkgdocdir}/collection
# no html files in collection directory
-rm -f %{buildroot}%{ansible_collection_files}%{collection_name}/README.html
+rm -f %{buildroot}%{ansible_collection_files}/%{collection_name}/README.html
for rolename in %{rolenames}; do
- if [ -f
%{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.md ];
then
+ if [ -f
%{buildroot}%{ansible_collection_files}/%{collection_name}/roles/${rolename}/README.md ];
then
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename}
- cp -p
%{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.md \
-
%{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.html \
+ cp -p
%{buildroot}%{ansible_collection_files}/%{collection_name}/roles/${rolename}/README.md \
+
%{buildroot}%{ansible_collection_files}/%{collection_name}/roles/${rolename}/README.html
\
$RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename}
# no html files in collection directory
- rm -f
%{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.html
+ rm -f
%{buildroot}%{ansible_collection_files}/%{collection_name}/roles/${rolename}/README.html
fi
done
@@ -501,8 +501,8 @@ echo '%dir %{_datadir}/ansible/roles' >> $files_section
echo '%dir %{installbase}' >> $files_section
%endif
echo '%dir %{ansible_collection_files}' >> $files_section
-echo '%dir %{ansible_collection_files}%{collection_name}' >>
$files_section
-find %{buildroot}%{ansible_collection_files}%{collection_name} -mindepth 1 -maxdepth 1 |
\
+echo '%dir %{ansible_collection_files}/%{collection_name}' >>
$files_section
+find %{buildroot}%{ansible_collection_files}/%{collection_name} -mindepth 1 -maxdepth 1 |
\
while read item; do
if [[ "$item" == */roles ]]; then
format_item_for_files "$item" true >> $files_section
https://src.fedoraproject.org/rpms/linux-system-roles/c/63e7be2dbee01001e...