Skip to content

Fix changelog out of order error, test build script #9

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
Feb 23, 2018
Merged

Fix changelog out of order error, test build script #9

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
142522d
change packaging/redhat to rpm
DrDaveD Feb 23, 2018
410b3a3
fix changelog date order and change version to 2.3-1
DrDaveD Feb 23, 2018
f3d1011
update to version 2.3.1
DrDaveD Feb 23, 2018
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
4 changes: 2 additions & 2 deletions 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.2.tar.gz
Debtransform-Tar: cvmfs-config-osg-2.3.tar.gz
Format: 1.0
Version: 2.2.1
Version: 2.3.1
Binary: cvmfs-config-osg
Source: cvmfs-config-osg
Maintainer: Dave Dykstra <dwd@fnal.gov>
Expand Down
11 changes: 9 additions & 2 deletions rpm/cvmfs-config-osg.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: CernVM File System OSG Configuration and Public Keys
Name: cvmfs-config-osg
Version: 2.2
Version: 2.3
Release: 1%{?dist}
# download with:
# $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \
Expand Down Expand Up @@ -39,6 +39,13 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
%config %{_sysconfdir}/cvmfs/config.d/*

%changelog
* Fri Feb 23 2018 Dave Dykstra <dwd@fnal.gov> - 2.3-1
- Change the changelog date on version 2.0.3 from Feb 28 2017 to
May 28 2017 because osg-build complained about non-descending order
of the dates.
- Change the rpm/rpmbuild-cvmfs-config-osg development test script
to read from rpm instead of packaging/redhat.

* Thu Feb 22 2018 Dave Dykstra <dwd@fnal.gov> - 2.2-1
- Just change the version number because the OSG github-source for
reading spec files doesn't work with dash release tags.
Expand All @@ -52,7 +59,7 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
- Move packaging/debian to debian and packaging/redhat to rpm, to work
better with OBS and new OSG github packaging standard

* Tue Feb 28 2017 Dave Dykstra <dwd@fnal.gov> - 2.0-3
* Tue May 28 2017 Dave Dykstra <dwd@fnal.gov> - 2.0-3
- Use common install Makefile between debian and redhat

* Fri May 19 2017 Brian Lin <blin@cs.wisc.edu> - 2.0-2
Expand Down
2 changes: 1 addition & 1 deletion rpm/rpmbuild-cvmfs-config-osg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -ex
PKG="`echo $0|sed 's/.*build-//'`"
SRCDIR=$HOME/work/$PKG
cd $SRCDIR
SPEC=packaging/redhat/$PKG.spec
SPEC=rpm/$PKG.spec
VERSION="`sed -n 's/^Version: //p' $SPEC`"
cd $RPMBUILD/SOURCES
ln -fns $SRCDIR $PKG-$VERSION
Expand Down