1b641ac
@@ -113,8 +113,8 @@
# The load directive is supported since RPM 4.12, i.e. F21+. The build process
# fails on older Fedoras.
- %{?load:%{SOURCE4}}
- %{?load:%{SOURCE5}}
+ %{load:%{SOURCE4}}
+ %{load:%{SOURCE5}}
# Fix ruby_version abuse.
# https://bugs.ruby-lang.org/issues/11002
This PR is to fix FTBFS.
The FTBFS has started to happen with rpm-4.16.90-0.git15395.2.fc35.
Here is a scratch build for the current rawhide branch. https://koji.fedoraproject.org/koji/taskinfo?taskID=67286740
root.log
DEBUG util.py:444: error: line 116: Unknown tag: /chroot_tmpdir/srpm_unpacked/SOURCES/macros.ruby
As the %{?load:...} is undocumented, it is gone.
%{?load:...}
https://github.com/rpm-software-management/rpm/issues/1669
%{load:...} works as always but any undocumented special behaviors of conditionals on built-in macros are gone in 4.17, %{?foo} always tests whether said macro is defined or not, both built-ins and user-defined macros.
Here is the test I am doing.
rebased onto 1b641ac
Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
Vagrant has the same issue, thanks for investigating!
@pvalena The rpmlint started to have errors. I think it's not enough to use %{load:...} to avoid the rpmlint errors. I opened the upstream ticket. https://github.com/rpm-software-management/rpmlint/issues/632
%{load:...}
$ rpmlint *.spec ... ruby.spec: E: specfile-error error: ruby.spec: line 116: failed to load macro file /tmp/rpmlint.ruby.spec.ydrd1bsm/macros.ruby ruby.spec: E: specfile-error error: query of specfile ruby.spec failed, can't parse 0 packages and 1 specfiles checked; 3 errors, 4 warnings
I see, but I think it's a separate issue for linter, then. Primarily, it's building.
So LGTM.
Yeah it's at least better than the current situation.
@vondruch Any comments? Do you agree with this PR?
I see your comment here. https://github.com/rpm-software-management/rpm/issues/1669
The rpmlint started to have errors. I think it's not enough to use %{load:...} to avoid the rpmlint errors. I opened the upstream ticket. https://github.com/rpm-software-management/rpmlint/issues/632
Now the rpmlint issue was fixed on the upstream. So, there is less concern to merge this PR now.
https://github.com/rpm-software-management/rpmlint/commit/aa97267150efa48de0dc77aca6de12ef2fef8fe2
I opened BZ ticket for rpmlint on Fedora to apply the patch to the RPM used in Zuul CI. https://bugzilla.redhat.com/show_bug.cgi?id=1959363
Pull-Request has been merged by jaruga
As we chat, as the issue on this PR blocks the Fedora module build, we merged this PR.
jaruga
commented 2 years ago
This PR is to fix FTBFS.
The FTBFS has started to happen with rpm-4.16.90-0.git15395.2.fc35.
Here is a scratch build for the current rawhide branch.
https://koji.fedoraproject.org/koji/taskinfo?taskID=67286740
root.log
As the
%{?load:...}is undocumented, it is gone.https://github.com/rpm-software-management/rpm/issues/1669
Here is the test I am doing.