PR#27: Backport %gpgverify API simplification and some minor cleanups - rpms/epel-rpm-macros

		`@@ -0,0 +1,5 @@`
		`+ addFilter("epel-rpm-macros\.src: W: strange-permission cmake-(build\|configure\|install) 755")`
		`+ addFilter("epel-rpm-macros\.src: W: strange-permission gpgverify 755")`
		`+ addFilter("no-%build-section")`
		`+ addFilter("no-documentation")`
		`+ addFilter("only-non-binary-in-usr-lib")`

epel-rpm-macros.spec

file modified

+8 -3

		`@@ -1,6 +1,6 @@`
		`Name: epel-rpm-macros`
		`Version: 8`
		`- Release: 19`
		`+ Release: 20`
		`Summary: Extra Packages for Enterprise Linux RPM macros`

		`Group: System Environment/Base`
		`@@ -70,7 +70,7 @@`
		`%{buildroot}%{_rpmconfigdir}/cmake-build`
		`install -Dpm 755 %{SOURCE23} \`
		`%{buildroot}%{_rpmconfigdir}/cmake-install`
		`- install -Dpm 755 %{SOURCE24} \`
		`+ install -Dpm 644 %{SOURCE24} \`
		`%{buildroot}/etc/rpm/macros.zzz-epel-override-cmake`


		`@@ -85,6 +85,11 @@`


		`%changelog`
		`+ * Sat May 01 2021 Todd Zullinger <tmz@pobox.com> - 8-20`
		`+ - Backport %%gpgverify API simplification`
		`+ - Remove exec perms from /etc/rpm/macros.zzz-epel-override-cmake`
		`+ - Silence rpmlint warnings about non-issues`
		`+`
		`* Tue Dec 22 2020 Miro Hrončok <mhroncok@redhat.com> - 8-19`
		`- Define %%python_disable_dependency_generator`

		`@@ -121,7 +126,7 @@`
		`- Add the %%pycached macro`

		`* Fri Apr 03 2020 Troy Dawson <tdawson@redhat.com> - 8-9`
		`- - Add %qt5_qtwebengine_arches to macros`
		`+ - Add %%qt5_qtwebengine_arches to macros`

		`* Thu Nov 21 2019 Troy Dawson <tdawson@redhat.com> - 8-8`
		`- Bump release to be in sync with playground build.`

macros.epel-rpm-macros

file modified

+16 -1

		`@@ -87,7 +87,22 @@`
		`%{nil}`

		`# gpgverify verifies signed sources. There is documentation in the script.`
		`- %gpgverify %{_rpmconfigdir}/gpgverify`
		`+ %gpgverify(k:s:d:) %{lua:`
		`+ local script = rpm.expand("%{_rpmconfigdir}/gpgverify ")`
		`+ local keyring = rpm.expand("%{-k*}")`
		`+ local signature = rpm.expand("%{-s*}")`
		`+ local data = rpm.expand("%{-d*}")`
		`+ print(script)`
		`+ if keyring ~= "" then`
		`+ print(rpm.expand("--keyring='%{SOURCE" .. keyring .. "}' "))`
		`+ end`
		`+ if signature ~= "" then`
		`+ print(rpm.expand("--signature='%{SOURCE" .. signature .. "}' "))`
		`+ end`
		`+ if data ~= "" then`
		`+ print(rpm.expand("--data='%{SOURCE" .. data .. "}' "))`
		`+ end`
		`+ }`

		`# qt5 macro removed from RHEL8 but needed to ensure qtwebengine, and`
		`# it's dependencies build on supported arches.`

rpmlint.cf

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- addFilter("no-%build-section")`

tmz commented 3 years ago

I noticed the simplified API for the %gpgverify macro was not present in epel8. It would be nice to be able to use the same macro call across branches.

This patch series syncs the %gpgverify macro config from redhat-rpm-config along with some other minor clean-ups I made in the process.

This is related to #12, though that was for epel8-playground. If/when this change is accepted, it should be simple enough to merge epel8 into epel8-playground to achieve the same goal as #12.

I have a similar change prepared for epel7. I'll wait to see how this PR shakes out, in case there are changes I need to make.

I tested both epel8 and epel7 with a package which uses %gpgverify -d0 -s1 -k2.

Thanks.