From 142522d0de8de07c812abf88df37dc5058afaa54 Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Fri, 23 Feb 2018 11:32:50 -0600 Subject: [PATCH 1/3] change packaging/redhat to rpm --- rpm/rpmbuild-cvmfs-config-osg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/rpmbuild-cvmfs-config-osg b/rpm/rpmbuild-cvmfs-config-osg index 94e1fb4..df38c41 100755 --- a/rpm/rpmbuild-cvmfs-config-osg +++ b/rpm/rpmbuild-cvmfs-config-osg @@ -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 From 410b3a3ef37bf075ca34373f08977f7dd101217c Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Fri, 23 Feb 2018 11:35:14 -0600 Subject: [PATCH 2/3] fix changelog date order and change version to 2.3-1 --- rpm/cvmfs-config-osg.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rpm/cvmfs-config-osg.spec b/rpm/cvmfs-config-osg.spec index 2009180..86b1961 100644 --- a/rpm/cvmfs-config-osg.spec +++ b/rpm/cvmfs-config-osg.spec @@ -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 \ @@ -39,6 +39,13 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT %config %{_sysconfdir}/cvmfs/config.d/* %changelog +* Fri Feb 23 2018 Dave Dykstra - 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 - 2.2-1 - Just change the version number because the OSG github-source for reading spec files doesn't work with dash release tags. @@ -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 - 2.0-3 +* Tue May 28 2017 Dave Dykstra - 2.0-3 - Use common install Makefile between debian and redhat * Fri May 19 2017 Brian Lin - 2.0-2 From f3d10117bc9f0161b1de8c98dee363bc9c897e19 Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Fri, 23 Feb 2018 11:35:37 -0600 Subject: [PATCH 3/3] update to version 2.3.1 --- debian/cvmfs-config-osg.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/cvmfs-config-osg.dsc b/debian/cvmfs-config-osg.dsc index 92d9471..4c54872 100644 --- a/debian/cvmfs-config-osg.dsc +++ b/debian/cvmfs-config-osg.dsc @@ -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