From 1e0779e90f243c11bf6228c8364aaa33ba3f9f8f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 5 Nov 2018 10:34:00 +0100 Subject: [PATCH] Bump GCT release version to 6.2 --- configure.ac | 2 +- packaging/debian/globus-common/debian/changelog.in | 6 ++++++ packaging/debian/globus-common/debian/rules | 2 +- packaging/debian/globus-ftp-client/debian/changelog.in | 6 ++++++ packaging/debian/globus-ftp-client/debian/rules | 2 +- packaging/debian/globus-gass-copy/debian/changelog.in | 6 ++++++ packaging/debian/globus-gass-copy/debian/rules | 2 +- .../debian/globus-gram-job-manager/debian/changelog.in | 6 ++++++ packaging/debian/globus-gram-job-manager/debian/rules | 1 + .../debian/globus-gridftp-server/debian/changelog.in | 6 ++++++ packaging/debian/globus-gridftp-server/debian/rules | 2 +- .../debian/globus-gsi-cert-utils/debian/changelog.in | 6 ++++++ packaging/debian/globus-gsi-cert-utils/debian/rules | 2 +- .../globus-scheduler-event-generator/debian/changelog.in | 6 ++++++ .../debian/globus-scheduler-event-generator/debian/rules | 2 -- packaging/fait_accompli/version | 2 +- packaging/fedora/globus-common.spec | 7 +++++-- packaging/fedora/globus-ftp-client.spec | 7 +++++-- packaging/fedora/globus-gass-copy.spec | 7 +++++-- packaging/fedora/globus-gram-job-manager.spec | 7 +++++-- packaging/fedora/globus-gridftp-server.spec | 9 ++++++--- packaging/fedora/globus-gsi-cert-utils.spec | 7 +++++-- packaging/fedora/myproxy.spec | 1 - 23 files changed, 81 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 056be06300..27ebe36f7f 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ if test -e .git ; then fi fi])dnl m4_[]include(globus-version.inc)])dnl -m4_define([gtreleasebuild], [6.0.]globus_buildno) +m4_define([gtreleasebuild], [6.2.]globus_buildno) AC_INIT([gct], gtreleasebuild, [https://github.com/gridcf/gct/issues]) m4_define([short_version], [m4_substr(AC_PACKAGE_VERSION, [0], diff --git a/packaging/debian/globus-common/debian/changelog.in b/packaging/debian/globus-common/debian/changelog.in index c9cdeaeb44..8ba2b91f86 100644 --- a/packaging/debian/globus-common/debian/changelog.in +++ b/packaging/debian/globus-common/debian/changelog.in @@ -1,3 +1,9 @@ +globus-common (18.0-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:05:11 +0100 + globus-common (18.0-1+gct.@distro@) @distro@; urgency=medium * First Grid Community Toolkit release diff --git a/packaging/debian/globus-common/debian/rules b/packaging/debian/globus-common/debian/rules index a722e6ea28..059894c597 100644 --- a/packaging/debian/globus-common/debian/rules +++ b/packaging/debian/globus-common/debian/rules @@ -29,7 +29,7 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ + GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/debian/globus-ftp-client/debian/changelog.in b/packaging/debian/globus-ftp-client/debian/changelog.in index f1c2bf077b..630d7ace3f 100644 --- a/packaging/debian/globus-ftp-client/debian/changelog.in +++ b/packaging/debian/globus-ftp-client/debian/changelog.in @@ -1,3 +1,9 @@ +globus-ftp-client (9.1-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:05:26 +0100 + globus-ftp-client (9.1-1+gct.@distro@) @distro@; urgency=medium * Use 2048 bit RSA key for tests diff --git a/packaging/debian/globus-ftp-client/debian/rules b/packaging/debian/globus-ftp-client/debian/rules index 88bd021169..e2adab148e 100644 --- a/packaging/debian/globus-ftp-client/debian/rules +++ b/packaging/debian/globus-ftp-client/debian/rules @@ -27,7 +27,7 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ + GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/debian/globus-gass-copy/debian/changelog.in b/packaging/debian/globus-gass-copy/debian/changelog.in index 41a808cef0..639e2dd6d3 100644 --- a/packaging/debian/globus-gass-copy/debian/changelog.in +++ b/packaging/debian/globus-gass-copy/debian/changelog.in @@ -1,3 +1,9 @@ +globus-gass-copy (10.3-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:06:03 +0100 + globus-gass-copy (10.3-1+gct.@distro@) @distro@; urgency=medium * Split guc-cc.pl test into smaller tests diff --git a/packaging/debian/globus-gass-copy/debian/rules b/packaging/debian/globus-gass-copy/debian/rules index 92564d118a..b2a714ca0a 100644 --- a/packaging/debian/globus-gass-copy/debian/rules +++ b/packaging/debian/globus-gass-copy/debian/rules @@ -27,7 +27,7 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ + GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/debian/globus-gram-job-manager/debian/changelog.in b/packaging/debian/globus-gram-job-manager/debian/changelog.in index 4245f4651a..440ce7263e 100644 --- a/packaging/debian/globus-gram-job-manager/debian/changelog.in +++ b/packaging/debian/globus-gram-job-manager/debian/changelog.in @@ -1,3 +1,9 @@ +globus-gram-job-manager (15.1-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:06:38 +0100 + globus-gram-job-manager (15.1-1+gct.@distro@) @distro@; urgency=medium * Use 2048 bit RSA key for tests diff --git a/packaging/debian/globus-gram-job-manager/debian/rules b/packaging/debian/globus-gram-job-manager/debian/rules index f486f5e799..1510cb7f8f 100644 --- a/packaging/debian/globus-gram-job-manager/debian/rules +++ b/packaging/debian/globus-gram-job-manager/debian/rules @@ -24,6 +24,7 @@ configure-stamp: dh_autoreconf + GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/debian/globus-gridftp-server/debian/changelog.in b/packaging/debian/globus-gridftp-server/debian/changelog.in index baf59b3109..7d77c2ee81 100644 --- a/packaging/debian/globus-gridftp-server/debian/changelog.in +++ b/packaging/debian/globus-gridftp-server/debian/changelog.in @@ -1,3 +1,9 @@ +globus-gridftp-server (13.9-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:21:36 +0100 + globus-gridftp-server (13.9-1+gct.@distro@) @distro@; urgency=medium * Fix data_node restrict path diff --git a/packaging/debian/globus-gridftp-server/debian/rules b/packaging/debian/globus-gridftp-server/debian/rules index 50c34d8930..c1bdbbfd2e 100644 --- a/packaging/debian/globus-gridftp-server/debian/rules +++ b/packaging/debian/globus-gridftp-server/debian/rules @@ -24,7 +24,7 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ + GLOBUS_VERSION=6.2 \ GRIDMAP=/etc/grid-security/grid-mapfile \ dh_auto_configure -- \ --disable-static \ diff --git a/packaging/debian/globus-gsi-cert-utils/debian/changelog.in b/packaging/debian/globus-gsi-cert-utils/debian/changelog.in index 9dac50060a..60fa7c7e53 100644 --- a/packaging/debian/globus-gsi-cert-utils/debian/changelog.in +++ b/packaging/debian/globus-gsi-cert-utils/debian/changelog.in @@ -1,3 +1,9 @@ +globus-gsi-cert-utils (10.1-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:21:53 +0100 + globus-gsi-cert-utils (10.1-1+gct.@distro@) @distro@; urgency=medium * Fix broken subject in grid-cert-request diff --git a/packaging/debian/globus-gsi-cert-utils/debian/rules b/packaging/debian/globus-gsi-cert-utils/debian/rules index 9f7d8a0fdc..c329358042 100644 --- a/packaging/debian/globus-gsi-cert-utils/debian/rules +++ b/packaging/debian/globus-gsi-cert-utils/debian/rules @@ -27,7 +27,7 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ + GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/debian/globus-scheduler-event-generator/debian/changelog.in b/packaging/debian/globus-scheduler-event-generator/debian/changelog.in index a12fdb66ae..bc7338dfeb 100644 --- a/packaging/debian/globus-scheduler-event-generator/debian/changelog.in +++ b/packaging/debian/globus-scheduler-event-generator/debian/changelog.in @@ -1,3 +1,9 @@ +globus-scheduler-event-generator (6.0-2+gct.@distro@) @distro@; urgency=medium + + * Bump GCT release version to 6.2 + + -- Mattias Ellert Mon, 05 Nov 2018 10:08:26 +0100 + globus-scheduler-event-generator (6.0-1+gct.@distro@) @distro@; urgency=medium * First Grid Community Toolkit release diff --git a/packaging/debian/globus-scheduler-event-generator/debian/rules b/packaging/debian/globus-scheduler-event-generator/debian/rules index cb4c36df6e..213f007b4e 100644 --- a/packaging/debian/globus-scheduler-event-generator/debian/rules +++ b/packaging/debian/globus-scheduler-event-generator/debian/rules @@ -27,8 +27,6 @@ configure-stamp: dh_autoreconf - GLOBUS_VERSION=6.0 \ - GRIDMAP=/etc/grid-security/grid-mapfile \ dh_auto_configure -- \ --disable-static \ --includedir=$(_includedir)/globus \ diff --git a/packaging/fait_accompli/version b/packaging/fait_accompli/version index e0ea36feef..0cda48ac61 100644 --- a/packaging/fait_accompli/version +++ b/packaging/fait_accompli/version @@ -1 +1 @@ -6.0 +6.2 diff --git a/packaging/fedora/globus-common.spec b/packaging/fedora/globus-common.spec index 40efedf15c..4c0c1e3c2b 100644 --- a/packaging/fedora/globus-common.spec +++ b/packaging/fedora/globus-common.spec @@ -4,7 +4,7 @@ Name: globus-common %global soname 0 %global _name %(tr - _ <<< %{name}) Version: 18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Common Library Group: System Environment/Libraries @@ -156,7 +156,7 @@ Common Library Documentation Files %setup -q -n %{_name}-%{version} %build -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ --libexecdir=%{_datadir}/globus \ @@ -235,6 +235,9 @@ make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Mon Nov 05 2018 Mattias Ellert - 18.0-2 +- Bump GCT release version to 6.2 + * Sat Mar 31 2018 Mattias Ellert - 18.0-1 - First Grid Community Toolkit release - Move globus-makefile-header to devel package diff --git a/packaging/fedora/globus-ftp-client.spec b/packaging/fedora/globus-ftp-client.spec index f6d041fce3..c18cc7ebcd 100644 --- a/packaging/fedora/globus-ftp-client.spec +++ b/packaging/fedora/globus-ftp-client.spec @@ -4,7 +4,7 @@ Name: globus-ftp-client %global soname 2 %global _name %(tr - _ <<< %{name}) Version: 9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GridFTP Client Library Group: System Environment/Libraries @@ -109,7 +109,7 @@ GridFTP Client Library Documentation Files %setup -q -n %{_name}-%{version} %build -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ --libexecdir=%{_datadir}/globus \ @@ -153,6 +153,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Mon Nov 05 2018 Mattias Ellert - 9.1-2 +- Bump GCT release version to 6.2 + * Sat May 05 2018 Mattias Ellert - 9.1-1 - Use 2048 bit RSA key for tests diff --git a/packaging/fedora/globus-gass-copy.spec b/packaging/fedora/globus-gass-copy.spec index 20fc2b7f2a..e5e17bceb4 100644 --- a/packaging/fedora/globus-gass-copy.spec +++ b/packaging/fedora/globus-gass-copy.spec @@ -4,7 +4,7 @@ Name: globus-gass-copy %global soname 2 %global _name %(tr - _ <<< %{name}) Version: 10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus Gass Copy Group: System Environment/Libraries @@ -123,7 +123,7 @@ Globus Gass Copy Documentation Files %setup -q -n %{_name}-%{version} %build -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ --libexecdir=%{_datadir}/globus \ @@ -170,6 +170,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Mon Nov 05 2018 Mattias Ellert - 10.3-2 +- Bump GCT release version to 6.2 + * Mon Sep 03 2018 Mattias Ellert - 10.3-1 - Split guc-cc.pl test into smaller tests diff --git a/packaging/fedora/globus-gram-job-manager.spec b/packaging/fedora/globus-gram-job-manager.spec index 24fa5481e2..71673ff46f 100644 --- a/packaging/fedora/globus-gram-job-manager.spec +++ b/packaging/fedora/globus-gram-job-manager.spec @@ -3,7 +3,7 @@ Name: globus-gram-job-manager %global _name %(tr - _ <<< %{name}) Version: 15.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - GRAM Jobmanager Group: Applications/Internet @@ -102,7 +102,7 @@ Scheduler Event Generator Job Manager %setup -q -n %{_name}-%{version} %build -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ --libexecdir=%{_datadir}/globus \ @@ -154,6 +154,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %{_libdir}/libglobus_seg_job_manager.so %changelog +* Mon Nov 05 2018 Mattias Ellert - 15.1-2 +- Bump GCT release version to 6.2 + * Sat May 05 2018 Mattias Ellert - 15.1-1 - Use 2048 bit RSA key for tests diff --git a/packaging/fedora/globus-gridftp-server.spec b/packaging/fedora/globus-gridftp-server.spec index 2aa4156ee3..6706475659 100644 --- a/packaging/fedora/globus-gridftp-server.spec +++ b/packaging/fedora/globus-gridftp-server.spec @@ -4,7 +4,7 @@ Name: globus-gridftp-server %global soname 6 %global _name %(tr - _ <<< %{name}) Version: 13.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus GridFTP Server Group: System Environment/Libraries @@ -132,7 +132,7 @@ Globus GridFTP Server Development Files %build export GRIDMAP=%{_sysconfdir}/grid-security/grid-mapfile -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ %if %{?suse_version}%{!?suse_version:0} @@ -162,7 +162,7 @@ sed '/ env /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/gridftp.gfork sed '/^env /d' -i $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/gridftp %check -make %{_smp_mflags} check VERBOSE=1 +make %{?_smp_mflags} check VERBOSE=1 %post %{?nmainpkg} -p /sbin/ldconfig @@ -218,6 +218,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Nov 05 2018 Mattias Ellert - 13.9-2 +- Bump GCT release version to 6.2 + * Mon Sep 10 2018 Globus Toolkit - 13.9-1 - Fix data_node restrict path diff --git a/packaging/fedora/globus-gsi-cert-utils.spec b/packaging/fedora/globus-gsi-cert-utils.spec index c8b64ab7d4..0e6afb55ef 100644 --- a/packaging/fedora/globus-gsi-cert-utils.spec +++ b/packaging/fedora/globus-gsi-cert-utils.spec @@ -4,7 +4,7 @@ Name: globus-gsi-cert-utils %global soname 0 %global _name %(tr - _ <<< %{name}) Version: 10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grid Community Toolkit - Globus GSI Cert Utils Library Group: System Environment/Libraries @@ -123,7 +123,7 @@ Globus GSI Cert Utils Library Documentation Files %setup -q -n %{_name}-%{version} %build -export GLOBUS_VERSION=6.0 +export GLOBUS_VERSION=6.2 %configure --disable-static \ --includedir=%{_includedir}/globus \ --libexecdir=%{_datadir}/globus \ @@ -180,6 +180,9 @@ make %{?_smp_mflags} check VERBOSE=1 %doc %{_pkgdocdir}/GLOBUS_LICENSE %changelog +* Mon Nov 05 2018 Mattias Ellert - 10.1-2 +- Bump GCT release version to 6.2 + * Fri Oct 19 2018 Mattias Ellert - 10.1-1 - Fix broken subject in grid-cert-request diff --git a/packaging/fedora/myproxy.spec b/packaging/fedora/myproxy.spec index ae5427f908..27da48e205 100644 --- a/packaging/fedora/myproxy.spec +++ b/packaging/fedora/myproxy.spec @@ -344,7 +344,6 @@ fi # myproxy-server wants exactly 700 permission on its data # which is just fine. %attr(0700,myproxy,myproxy) %dir %{_localstatedir}/lib/myproxy -%dir %{_sysconfdir}/grid-security %dir %{_sysconfdir}/grid-security/myproxy %{_mandir}/man8/myproxy-server.8* %{_mandir}/man5/myproxy-server.config.5*