From 5b44d6d65cb00388b6372b019d58b25d9ecbe0e0 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 14 Mar 2023 17:09:17 -0500 Subject: [PATCH 1/2] Update RPM packaging to build on EL9 (SOFTWARE-5530) --- rpm/osg-pki-tools.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rpm/osg-pki-tools.spec b/rpm/osg-pki-tools.spec index d94dea5..ac02ede 100644 --- a/rpm/osg-pki-tools.spec +++ b/rpm/osg-pki-tools.spec @@ -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 - 3.5.2-2 +- Update RPM spec to build on EL9 (SOFTWARE-5530) + * Fri Jun 03 2022 Carl Edquist - 3.5.2-1 - Fix another bytes vs string bug in osg-incommon-cert-request (SOFTWARE-5197) From 1496961257d290ac8e56eca8041839e8f5d4dc0f Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 14 Mar 2023 17:30:52 -0500 Subject: [PATCH 2/2] OSG 3.5 is no longer supported --- .github/workflows/build-sw-container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-sw-container.yml b/.github/workflows/build-sw-container.yml index 01694a5..de34340 100644 --- a/.github/workflows/build-sw-container.yml +++ b/.github/workflows/build-sw-container.yml @@ -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/build-container-action@v0.3.1 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