Skip to content

Commit 55ebcdc

Browse files
committed
update to 2.4.3, add Obsoletes cvmfs-config-default and Conflicts cvmfs-config-egi
1 parent a2bc090 commit 55ebcdc

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

rpm/cvmfs-config-osg.spec

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: CernVM File System OSG Configuration and Public Keys
22
Name: cvmfs-config-osg
33
Version: 2.4
4-
Release: 1%{?dist}
4+
Release: 4%{?dist}
55
# download with:
66
# $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \
77
# https://github.com/opensciencegrid/cvmfs-config-osg/archive/v%{version}.tar.gz
@@ -20,7 +20,8 @@ Provides: cvmfs-init-scripts = 1.0.22
2020
Obsoletes: oasis-config < 8
2121
Provides: oasis-config = 9
2222

23-
Conflicts: cvmfs-config-default
23+
Obsoletes: cvmfs-config-default
24+
Conflicts: cvmfs-config-egi
2425

2526
%prep
2627
%setup
@@ -39,6 +40,12 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
3940
%config %{_sysconfdir}/cvmfs/config.d/*
4041

4142
%changelog
43+
* Fri Mar 27 2020 Dave Dykstra <dwd@fnal.gov> - 2.4-4
44+
- Skipped release 2.4-2 and 2.4-3 to make consistent with cvmfs-config-egi.
45+
- Change Conflicts: cvmfs-config-default to Obsoletes: to make it
46+
easier to replace. Add Conflicts: cvmfs-config-egi because it
47+
is mutually exclusive.
48+
4249
* Tue Jul 23 2019 Dave Dykstra <dwd@fnal.gov> - 2.4-1
4350
- Change the server urls for the config-osg repository to use openhtc.io
4451
aliases when the proxy url can use DIRECT.

0 commit comments

Comments
 (0)