#33 cenptkg srpm does not set the rhel macro properly
Closed 2 years ago by tdawson. Opened 3 years ago by churchyard.

Consider this spec fragment:

Source0:        %{pypi_source}
Source1:        %{pypi_source}.asc
Source2:        gpgkey-05FD_9FA1_6CF7_5735_0D91_A560_235A_E5F1_29F9_ED98.gpg
%if 0%{?rhel}
Source3:        cryptography-%{version}-vendor.tar.bz2
Source4:        conftest-skipper.py
%endif

You can find it in python-cryptography.

What is important is that is has %rhel conditionalized sources. I know this is frowned upon, but let me demonstrate how centpkg is broken when compared to rhpkg.

Run (on Fedora):

$ centpkg --release c9s srpm
setting SOURCE_DATE_EPOCH=1618531200
Wrote: /home/churchyard/rpmbuild/centpkg/python-cryptography/python-cryptography-3.4.6-2.el9.src.rpm

$ rhpkg --release rhel-9.0.0-beta srpm
setting SOURCE_DATE_EPOCH=1618531200
Wrote: /home/churchyard/rpmbuild/centpkg/python-cryptography/python-cryptography-3.4.6-2.el9_0_0.src.rpm

Now observe the soruces in the SRPMs:

$ rpm -qlp python-cryptography-3.4.6-2.el9.src.rpm  # created with centpkg
cryptography-3.4.6.tar.gz
cryptography-3.4.6.tar.gz.asc
gpgkey-05FD_9FA1_6CF7_5735_0D91_A560_235A_E5F1_29F9_ED98.gpg
python-cryptography.spec

$ rpm -qlp python-cryptography-3.4.6-2.el9_0_0.src.rpm  # created with rhpkg
conftest-skipper.py
cryptography-3.4.6-vendor.tar.bz2
cryptography-3.4.6.tar.gz
cryptography-3.4.6.tar.gz.asc
gpgkey-05FD_9FA1_6CF7_5735_0D91_A560_235A_E5F1_29F9_ED98.gpg
python-cryptography.spec

My guess is that the rhpkg command sets the rhel macro to 9 when creating the srpm and the centpkg command does not.


This works as a workaround:

$ centpkg srpm -- --define 'rhel\ 9'

The backslash there is another workaround, this time for https://pagure.io/rpkg/issue/587

A friendly bump. This is really annoying.

Metadata Update from @tdawson:
- Issue tagged with: Bug

2 years ago

This pull request should fix the issue! https://git.centos.org/centos/centpkg/pull-request/59

It should go out with the next centpkg release, which should be in a week or two :)

This should be fixed in centpkg 0.6.8 which is currently in fedora and epel-testing.

centpkg 0.6.8, which fixes this issue is in stable.

Metadata Update from @tdawson:
- Issue status updated to: Closed (was: Open)

2 years ago

For reference, this has regressed now when centpkg sources also parses the spec file: https://git.centos.org/centos/centpkg/issue/71

Log in to comment on this ticket.

Metadata
Related Pull Requests
  • #59 Merged 2 years ago