Skip to content

Commit 6805809

Browse files
committed
Add version clauses to Obsoletes
They won't help until we no longer have RPMs with unversioned obsoletes in the release repos (i.e., OSG 24) but let's fix it now so the problem will not propagate forward.
1 parent 5fc3d71 commit 6805809

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

rpm/igtf-ca-certs.spec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Provides: grid-certificates = 7
2626

2727
Conflicts: osg-ca-scripts
2828

29-
Obsoletes: vdt-ca-certs
30-
Obsoletes: igtf-ca-certs-experimental
29+
Obsoletes: vdt-ca-certs < 1.41
30+
Obsoletes: igtf-ca-certs-experimental < 1.41
3131
Obsoletes: igtf-ca-certs-compat <= 1.55
3232

3333
%description
@@ -63,6 +63,7 @@ sha256sum -c cacerts_sha256sum.txt
6363
%changelog
6464
* Tue Feb 20 2024 Mátyás Selmeci <[email protected]> - 1.127-1
6565
- Update to IGTF 1.127 (SOFTWARE-5828)
66+
- Add version clauses to Obsoletes
6667

6768
* Wed Jan 3 2024 Matt Westphall <[email protected]> - 1.126-1
6869
- Update to IGTF 1.126 (SOFTWARE-5790)

rpm/osg-ca-certs.spec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Provides: grid-certificates = 7
3030

3131
Conflicts: osg-ca-scripts
3232

33-
Obsoletes: vdt-ca-certs
34-
Obsoletes: osg-ca-certs-experimental
33+
Obsoletes: vdt-ca-certs < 1.23
34+
Obsoletes: osg-ca-certs-experimental < 1.23
3535
Obsoletes: osg-ca-certs-compat <= 1:1.37
3636
%if 0%{?rhel} >= 8
3737
RemovePathPostfixes: .trusted-cert
@@ -105,6 +105,7 @@ mv certificates/* $RPM_BUILD_ROOT/etc/grid-security/certificates/
105105
%changelog
106106
* Tue Feb 20 2024 Mátyás Selmeci <[email protected]> - 1.118-1
107107
- Update to IGTF 1.127 (SOFTWARE-5828)
108+
- Add version clauses to Obsoletes
108109

109110
* Wed Jan 3 2024 Matt Westphall <[email protected]> - 1.117-1
110111
- Update to IGTF 1.126 (SOFTWARE-5790)

0 commit comments

Comments
 (0)