Skip to content

restore official 2.0-2 changes #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 22, 2017
Merged

restore official 2.0-2 changes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd5c640
restore official 2.0-2 changes
DrDaveD Dec 20, 2017
8898595
increase Release number
DrDaveD Dec 20, 2017
b29065c
increase to 2.1.2 to match rpm
DrDaveD Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/cvmfs-config-osg.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# created by obsupdate.sh, do not edit by hand
Debtransform-Tar: cvmfs-config-osg-2.1.tar.gz
Format: 1.0
Version: 2.1.1
Version: 2.1.2
Binary: cvmfs-config-osg
Source: cvmfs-config-osg
Maintainer: Dave Dykstra <dwd@fnal.gov>
Expand Down
13 changes: 7 additions & 6 deletions rpm/cvmfs-config-osg.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: CernVM File System OSG Configuration and Public Keys
Name: cvmfs-config-osg
Version: 2.1
Release: 1%{?dist}
Release: 2%{?dist}
# download with:
# $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \
# https://github.com/opensciencegrid/cvmfs-config-osg/archive/v%{version}.tar.gz
Expand All @@ -22,9 +22,6 @@ Provides: oasis-config = 9

Conflicts: cvmfs-config-default

Conflicts: cvmfs < 2.3.3
Conflicts: cvmfs-server < 2.3.3

%prep
%setup

Expand All @@ -42,6 +39,10 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
%config %{_sysconfdir}/cvmfs/config.d/*

%changelog
* Wed Dec 20 2017 Dave Dykstra <dwd@fnal.gov> - 2.1-2
- Restore the changes from 2.0-2 that were accidentally wiped out in
the conversion to github.

* Fri Nov 17 2017 Dave Dykstra <dwd@fnal.gov> - 2.1-1
- Merge LIGO changes to debian packaging
- Move packaging/debian to debian and packaging/redhat to rpm, to work
Expand All @@ -50,8 +51,8 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
* Tue Feb 28 2017 Dave Dykstra <dwd@fnal.gov> - 2.0-3
- Use common install Makefile between debian and redhat

* Fri Feb 24 2017 Dave Dykstra <dwd@fnal.gov> - 2.0-2
- Convert to store source on github.
* Fri May 19 2017 Brian Lin <blin@cs.wisc.edu> - 2.0-2
- Drop conflicts (SOFTWARE-2678)

* Wed Feb 15 2017 Dave Dykstra <dwd@fnal.gov> - 2.0-1
- Increase the version number further to make sure it is higher than
Expand Down