Skip to content

Commit 191e697

Browse files
authored
Merge pull request #106 from DrDaveD/el9-wheels
Restore use of python wheels when on el9
2 parents b78bc18 + acd1350 commit 191e697

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

htgettoken.spec

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ Requires: python%{python3_pkgversion}-paramiko
3232
Requires: python%{python3_pkgversion}-urllib3
3333
# /usr/bin/httokendecode:
3434
Requires: jq
35-
%if 0%{?rhel} && 0%{?rhel} >= 8
3635
Recommends: scitokens-cpp
37-
%endif
3836

3937
%description
4038
htgettoken gets OIDC bearer tokens by interacting with Hashicorp vault
@@ -52,11 +50,19 @@ htgettoken gets OIDC bearer tokens by interacting with Hashicorp vault
5250
%autosetup -n %{name}-%{version}
5351

5452
%build
53+
%if 0%{?rhel} >= 9
54+
%py3_build_wheel
55+
%else
5556
%py3_build
57+
%endif
5658

5759
%install
5860
# install the Python project
61+
%if 0%{?rhel} >= 9
62+
%py3_install_wheel %{name}-%{version}-*.whl
63+
%else
5964
%py3_install
65+
%endif
6066
# link httokendecode to htdecodetoken
6167
(cd %{buildroot}%{_bindir}/; ln -s htdecode httokendecode)
6268
# install man pages
@@ -72,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
7278

7379
# -- changelog
7480

81+
# - Use python wheels to build/install on el9. It didn't work on el8 so
82+
# the use of wheels was removed at the last minute before the 2.0
83+
# release (without removing it from the changelog like it should have).
84+
7585
%changelog
7686
* Wed Jul 24 2024 Dave Dykstra <dwd@fnal.gov> 2.0-1
7787
- Replace use of m2crypto and pyOpenSSL with urllib3

0 commit comments

Comments
 (0)