PR#8: Add BuildRequires: rubygem-kramdown for Fedora and RHEL >= 9 - rpms/linux-system-roles

rpms / linux-system-roles

#8 Add BuildRequires: rubygem-kramdown for Fedora and RHEL >= 9

Merged 3 years ago by spetros. Opened 3 years ago by spetros.

rpms/ spetros/linux-system-roles add-kramdown into rawhide

Keep only one entry for auto-maintenance in sources

Sergei Petrosian • 3 years ago

5e168b3

Add the requirement for kramdown for Fedora and RHEL 9 builds

Sergei Petrosian • 3 years ago

8169129

.gitignore

file modified

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

linux-system-roles.spec

file modified

+13 -4

		`@@ -14,7 +14,7 @@`
		`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 @@`
		`%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 @@`

		`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 @@`
		`%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`

sources

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- SHA512 (auto-maintenance-7d093179c3b649f4375ed67f8edd8fca87f0ba1f.tar.gz) = 7290f2a2a477aa09d40c972d6361d7b89d734c1aedce64a702a81e57b728810f55d78fab88e8355a08115e929d135a56c12892228102e4d27ab20fcb645706f0`
		`+ SHA512 (auto-maintenance-17baba973c8c77b32ae65838a98dc4fbaf7b7b3e.tar.gz) = 769fd93b42f97c54cc9435aaa62a2b2d21882315593bc0fc4e38d5c667a7ff952d93b59e93dd35035ce41be19729c98eb07419718f52e651a8a9be313311f816`
		`SHA512 (ansible-sshd-32f9d0dda5a801cbefad09214ec2d88b6838b943.tar.gz) = 2191a78e59dd55b976dec3c017115ce8f618a01b9b8cce3c9373862e6ce087ca2ab411e9bf4d0466d7ee52d2d68954bb48736acc931fcf68f046af2995e43f3c`
		`SHA512 (certificate-310fc53db04e8d3134524afb7a89b0477a2ffb83.tar.gz) = 01ace6d936859422957b8685f035eaefc64874add266fe062eb862cc57a9f0f5c218937a31d95fa57b22d3ceb610d45e103bb1b684ea337808a6dca374b7bf3e`
		`SHA512 (crypto_policies-b2a9857ac661fa32e66666e444b73bfdb34cdf95.tar.gz) = 59471ed5df2d6f5933f087e08ceab7535a02d1830d0ae240d5261dd5c8819f4d7c6c376ed1308704af380a032678068532ea7cdcaa65e596971fdd7575312d8f`

spetros commented 3 years ago

As per this BZ, pandoc should be dropped from RHEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=1943532

spetros commented 3 years ago

rmeggins commented on line 6 of linux-system-roles.spec 3 years ago

This may have to be changed once https://github.com/linux-system-roles/auto-maintenance/pull/61 is fixed and merged

1 new commit added

Update mainid to the latest master commit of auto-maintenance

3 years ago

1 new commit added

Upload the updated sources file

3 years ago

rmeggins commented on line 29 of linux-system-roles.spec 3 years ago

you'll need to keep the version the same - 1.1.0 - and only bump the Release to 4 - you'll need to change the Release field in the spec file

1 new commit added

Separate requirements for galaxy_transform and md2html, bump release

3 years ago

pcahyna commented on line 46 of linux-system-roles.spec 3 years ago

Why do you bump the Release number of Rich's update?

1 new commit added

Bump the release to 2

3 years ago

1 new commit added

Fix version

3 years ago

spetros commented 3 years ago

Sorry I didn't see the version bump from the previous Rich's changelog line and got confused. I think I fixed the version and the release numbers now.

rmeggins commented 3 years ago

lgtm

6 new commits added