Skip to content

Commit 59b5d72

Browse files
Merge pull request #22 from matyasselmeci/pr/no-osg-ca-certs-java-on-el7.SOFTWARE-5764
Do not build osg-ca-certs-java on EL7
2 parents eee5be8 + 8112823 commit 59b5d72

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

rpm/osg-ca-certs.spec

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%define igtf_version 1.125
22
%define osg_version 1.116
3-
%define release_num 1
3+
%define release_num 2
44
%define vtag %{osg_version}.igtf.%{igtf_version}-%{release_num}
55
%define enable_trusted_sha1_certs 0
66

@@ -33,11 +33,14 @@ Conflicts: osg-ca-scripts
3333
Obsoletes: vdt-ca-certs
3434
Obsoletes: osg-ca-certs-experimental
3535
Obsoletes: osg-ca-certs-compat <= 1:1.37
36+
%if 0%{?rhel} >= 8
3637
RemovePathPostfixes: .trusted-cert
38+
%endif
3739

3840
%description
3941
For details about the current certificate release, see https://repo.opensciencegrid.org/cadist/ and change log at https://repo.opensciencegrid.org/cadist/CHANGES.
4042

43+
%if 0%{?rhel} >= 8
4144
%package java
4245
Summary: Java-compatible SHA1 certs for %{name}
4346
BuildArch: noarch
@@ -46,6 +49,7 @@ RemovePathPostfixes: .java-cert
4649

4750
%description java
4851
For details about the current certificate release, see https://repo.opensciencegrid.org/cadist/ and change log at https://repo.opensciencegrid.org/cadist/CHANGES.
52+
%endif
4953

5054
%prep
5155
%setup -n osg-certificates-%{vtag}
@@ -61,13 +65,15 @@ export PKG_NAME=%{name}
6165

6266
./build-certificates-dir.sh
6367

68+
%if 0%{?rhel} >= 8
6469
%if 0%{?enable_trusted_sha1_certs}
6570
./add-trusted-sha1-certs.sh certificates trusted-cert java-cert
6671
%else
6772
# We still want to make the osg-ca-certs and osg-ca-certs-java RPMs
6873
find certificates -name "*.pem" -exec cp '{}' '{}.java-cert' ';'
6974
find certificates -name "*.pem" -exec mv '{}' '{}.trusted-cert' ';'
7075
%endif
76+
%endif
7177

7278
%install
7379
mkdir -p $RPM_BUILD_ROOT/etc/grid-security/certificates
@@ -85,13 +91,18 @@ mv certificates/* $RPM_BUILD_ROOT/etc/grid-security/certificates/
8591
/etc/grid-security/certificates/*
8692
%doc
8793

94+
%if 0%{?rhel} >= 8
8895
%files java
8996
%defattr(0644,root,root,-)
9097
%dir %attr(0755,root,root) /etc/grid-security/certificates
9198
/etc/grid-security/certificates/*
9299
%doc
100+
%endif
93101

94102
%changelog
103+
* Wed Nov 29 2023 Mátyás Selmeci <[email protected]> - 1.116-2
104+
- Do not attempt to build osg-ca-certs-java on el7 (SOFTWARE-5764)
105+
95106
* Wed Nov 29 2023 Mátyás Selmeci <[email protected]> - 1.116-1
96107
- Update to IGTF 1.125; remove el9 cert changes (SOFTWARE-5764)
97108

0 commit comments

Comments
 (0)