Add the requirement for kramdown for Fedora and RHEL 9 builds

Update mainid to the latest master commit of auto-maintenance

Upload the updated sources file

Separate requirements for galaxy_transform and md2html, fix version

Related: rhbz#1943532
This commit is contained in:
Sergei Petrosian 2021-05-10 15:21:58 +02:00 committed by Noriko Hosoi
parent 781faa9e57
commit 2ef139db83
3 changed files with 15 additions and 4 deletions

1
.gitignore vendored
View File

@ -84,3 +84,4 @@
/tlog-2b9e53233ee3a68bdb532e62f289733e436a6106.tar.gz
/vpn-197a4b4b34911251b639307963f1aa3c50a10370.tar.gz
/vpn-5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3.tar.gz
/auto-maintenance-17baba973c8c77b32ae65838a98dc4fbaf7b7b3e.tar.gz

View File

@ -14,7 +14,7 @@ Name: linux-system-roles
Url: https://github.com/linux-system-roles/
Summary: Set of interfaces for unified system management
Version: 1.2.0
Release: 1%{?dist}
Release: 2%{?dist}
#Group: Development/Libraries
License: GPLv3+ and MIT and BSD
@ -166,7 +166,7 @@ BuildRequires: ansible >= 2.9.10
%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
%global rolename18 vpn
%global mainid 7d093179c3b649f4375ed67f8edd8fca87f0ba1f
%global mainid 17baba973c8c77b32ae65838a98dc4fbaf7b7b3e
Source: %{url}auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
Source1: %{archiveurl1}
Source2: %{archiveurl2}
@ -196,10 +196,16 @@ Patch52: network-disable-bondtests.diff
BuildArch: noarch
# These are needed for md2html.sh to build the documentation
BuildRequires: asciidoc
# Requirements for md2html.sh to build the documentation
%if 0%{?fedora} || 0%{?rhel} >= 9
BuildRequires: rubygem-kramdown-parser-gfm
%else
BuildRequires: pandoc
BuildRequires: asciidoc
BuildRequires: highlight
%endif
# Requirements for galaxy_transform.py
BuildRequires: python3
BuildRequires: python3-six
BuildRequires: python3dist(ruamel.yaml)
@ -538,6 +544,9 @@ fi
%endif
%changelog
* Mon May 21 2021 Sergei Petrosian <spetrosi@redhat.com> - 1.2.0-2
- Add BuildRequires: rubygem-kramdown for Fedora and RHEL >= 9
* Fri May 14 2021 Rich Megginson <rmeggins@redhat.com> - 1.2.0-1
- rebase roles to latest upstream
Resolves rhbz#1957876

View File

@ -17,3 +17,4 @@ SHA512 (storage-b3b456183edb7b8aa6ceff7ce667d8e22009ef6a.tar.gz) = faa3a15621bdf
SHA512 (timesync-3f69039d5ff986a74ed76bc4419da7b2efb2992a.tar.gz) = 5f50055a6955358548efc46ab76a0e3e32577a8c0e4b8f43fc9317b371fcb65d615c3f58f420d8774a57d4d41865f97d209aebd7074bc3ed9c9bccf6a4b1818b
SHA512 (tlog-2b9e53233ee3a68bdb532e62f289733e436a6106.tar.gz) = bc1499f1524408f960bf93a41b55ead436ecb26cf00c9d7147c530a46f647accd1246e81f92ac31a60c516ba9e38f2fa28a0727ce4130e892383982c67d3bd66
SHA512 (vpn-5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3.tar.gz) = 308b44fa888c99a37dd1143c0e84edcd19d757662bcacbd8553f50842ab40ddfa1e2638ad1523e8d4fd6a0a57e37c6f47c10e62a585e1951314b07642043328b
SHA512 (auto-maintenance-17baba973c8c77b32ae65838a98dc4fbaf7b7b3e.tar.gz) = 769fd93b42f97c54cc9435aaa62a2b2d21882315593bc0fc4e38d5c667a7ff952d93b59e93dd35035ce41be19729c98eb07419718f52e651a8a9be313311f816