rpms/rhel-system-roles
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Naturalize urls

Browse Source 
Resolves: rhbz#1978731

It is more natural to have no slash / at the end of the url definition,
and instead use / where the url is used

Fix the forgeorg15 url

(cherry picked from commit 7c7eb82eee1390e461c4118eaf84845c25ca5581)
This commit is contained in:
Sergei Petrosian 2021-06-10 11:49:50 +02:00 committed by Rich Megginson
parent 4633003ca6
commit bca54c544b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-system-roles.spec
View File

@ -19,10 +19,10 @@ Name: rhel-system-roles
%else %else
Name: linux-system-roles Name: linux-system-roles
%endif %endif
Url: https://github.com/linux-system-roles/ Url: https://github.com/linux-system-roles
Summary: Set of interfaces for unified system management Summary: Set of interfaces for unified system management
Version: 1.2.3 Version: 1.2.3
Release: 1%{?dist} Release: 2%{?dist}
#Group: Development/Libraries #Group: Development/Libraries
License: GPLv3+ and MIT and BSD License: GPLv3+ and MIT and BSD
@ -92,7 +92,7 @@ BuildRequires: ansible >= 2.9.10
%%global shortcommit%{1} %%(c=%%{ref%{1}}; echo ${c:0:7}) %%global shortcommit%{1} %%(c=%%{ref%{1}}; echo ${c:0:7})
%%global extractdir%{1} %%{expand:%%getarchivedir %{1}} %%global extractdir%{1} %%{expand:%%getarchivedir %{1}}
%%{!?repo%{1}:%%global repo%{1} %%{rolename%{1}}} %%{!?repo%{1}:%%global repo%{1} %%{rolename%{1}}}
%%global archiveurl%{1} %%{?forgeorg%{1}}%%{!?forgeorg%{1}:%%{url}}%%{repo%{1}}/archive/%%{ref%{1}}/%%{repo%{1}}-%%{ref%{1}}.tar.gz %%global archiveurl%{1} %%{?forgeorg%{1}}%%{!?forgeorg%{1}:%%{url}}/%%{repo%{1}}/archive/%%{ref%{1}}/%%{repo%{1}}-%%{ref%{1}}.tar.gz
%%global rolenames %%{?rolenames} %%{rolename%{1}} %%global rolenames %%{?rolenames} %%{rolename%{1}}
%%global roletodir%{1} [%{rolename%{1}}]="%{extractdir%{1}}" %%global roletodir%{1} [%{rolename%{1}}]="%{extractdir%{1}}"
%%global rolestodir %%{?rolestodir} %{roletodir%{1}} %%global rolestodir %%{?rolestodir} %{roletodir%{1}}
@ -101,7 +101,7 @@ BuildRequires: ansible >= 2.9.10
%define deftag() %{expand:%%global ref%{1} %{2} %define deftag() %{expand:%%global ref%{1} %{2}
%%global extractdir%{1} %%{expand:%%getarchivedir %{1}} %%global extractdir%{1} %%{expand:%%getarchivedir %{1}}
%%{!?repo%{1}:%%global repo%{1} %%{rolename%{1}}} %%{!?repo%{1}:%%global repo%{1} %%{rolename%{1}}}
%%global archiveurl%{1} %%{?forgeorg%{1}}%%{!?forgeorg%{1}:%%{url}}%%{repo%{1}}/archive/%%{ref%{1}}/%%{repo%{1}}-%%{ref%{1}}.tar.gz %%global archiveurl%{1} %%{?forgeorg%{1}}%%{!?forgeorg%{1}:%%{url}}/%%{repo%{1}}/archive/%%{ref%{1}}/%%{repo%{1}}-%%{ref%{1}}.tar.gz
%%global rolenames %%{?rolenames} %%{rolename%{1}} %%global rolenames %%{?rolenames} %%{rolename%{1}}
%%global roletodir%{1} [%{rolename%{1}}]="%{extractdir%{1}}" %%global roletodir%{1} [%{rolename%{1}}]="%{extractdir%{1}}"
%%global rolestodir %%{?rolestodir} %%{roletodir%{1}} %%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
@ -162,7 +162,7 @@ BuildRequires: ansible >= 2.9.10
%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95 %defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
%global rolename14 crypto_policies %global rolename14 crypto_policies
%global forgeorg15 https://github.com/willshersystems/ %global forgeorg15 https://github.com/willshersystems
%global repo15 ansible-sshd %global repo15 ansible-sshd
%global rolename15 sshd %global rolename15 sshd
%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943 %defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943
@ -598,6 +598,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Jun 16 2021 Sergei Petrosian <spetrosi@redhat.com> - 1.2.3-2
- Remove slash (/) from the end of URLs to improve code readability
* Wed Jun 16 2021 Noriko Hosoi <nhosoi@redhat.com> - 1.2.3-1 * Wed Jun 16 2021 Noriko Hosoi <nhosoi@redhat.com> - 1.2.3-1
- Add EL 9 support for timesync and network - Add EL 9 support for timesync and network
Resolves rhbz#1952887 Resolves rhbz#1952887