-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from brianhlin/SOFTWARE-5530.el9-support
Update RPM packaging to build on EL9 (SOFTWARE-5530)
- Loading branch information
Showing
2 changed files
with
12 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
yum_repo: ['development', 'testing', 'release'] | ||
osg_series: ['3.5', '3.6'] | ||
osg_series: ['3.6'] | ||
steps: | ||
- uses: opensciencegrid/[email protected] | ||
with: | ||
|
@@ -30,7 +30,7 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
yum_repo: ['development', 'testing', 'release'] | ||
osg_series: ['3.5', '3.6'] | ||
osg_series: ['3.6'] | ||
registry: | ||
- url: hub.opensciencegrid.org | ||
username: OSG_HARBOR_ROBOT_USER | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,19 @@ | ||
Summary: osg-pki-tools | ||
Name: osg-pki-tools | ||
Version: 3.5.2 | ||
Release: 1%{?dist} | ||
Release: 2%{?dist} | ||
Source: osg-pki-tools-%{version}.tar.gz | ||
License: Apache 2.0 | ||
Group: Grid | ||
URL: http://github.com/opensciencegrid/osg-pki-tools | ||
BuildArch: noarch | ||
%global __python /usr/bin/python3 | ||
# for brp-mangle-shebangs on EL8 | ||
%global __python3 /usr/bin/python3 | ||
BuildRequires: %{__python} | ||
BuildRequires: python3-m2crypto | ||
Requires: python3-m2crypto | ||
|
||
%global __python %{__python3} | ||
|
||
BuildRequires: python3 | ||
BuildRequires: python3-devel | ||
BuildRequires: python3-m2crypto | ||
Requires: python3-m2crypto | ||
|
||
%description | ||
%{summary} | ||
|
@@ -34,12 +33,15 @@ mkdir -p %{buildroot}%{_datadir}/man/man1 | |
gzip -c man/osg-incommon-cert-request.1 >%{buildroot}%{_datadir}/man/man1/osg-incommon-cert-request.1.gz | ||
|
||
%files | ||
%{python_sitelib}/osgpkitools | ||
%{python3_sitelib}/osgpkitools | ||
%{_bindir}/osg-cert-request | ||
%{_bindir}/osg-incommon-cert-request | ||
%{_datadir}/man/man1/osg-incommon-cert-request* | ||
|
||
%changelog | ||
* Tue Mar 14 2023 Brian Lin <[email protected]> - 3.5.2-2 | ||
- Update RPM spec to build on EL9 (SOFTWARE-5530) | ||
|
||
* Fri Jun 03 2022 Carl Edquist <[email protected]> - 3.5.2-1 | ||
- Fix another bytes vs string bug in osg-incommon-cert-request (SOFTWARE-5197) | ||
|
||
|