Skip to content

Commit

Permalink
Merge pull request #57 from ellert/gct-6.2
Browse files Browse the repository at this point in the history
Bump GCT release version to 6.2
  • Loading branch information
matyasselmeci authored Nov 5, 2018
2 parents 75eca56 + 1e0779e commit cc01aa4
Show file tree
Hide file tree
Showing 23 changed files with 81 additions and 23 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-common/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globus-common (18.0-2+gct.@distro@) @distro@; urgency=medium

* Bump GCT release version to 6.2

-- Mattias Ellert <[email protected]> Mon, 05 Nov 2018 10:05:11 +0100

globus-common (18.0-1+gct.@distro@) @distro@; urgency=medium

* First Grid Community Toolkit release
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/globus-common/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ configure-stamp:

dh_autoreconf

GLOBUS_VERSION=6.0 \
GLOBUS_VERSION=6.2 \
dh_auto_configure -- \
--disable-static \
--includedir=$(_includedir)/globus \
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-ftp-client/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globus-ftp-client (9.1-2+gct.@distro@) @distro@; urgency=medium

* Bump GCT release version to 6.2

-- Mattias Ellert <[email protected]> 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
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/globus-ftp-client/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ configure-stamp:

dh_autoreconf

GLOBUS_VERSION=6.0 \
GLOBUS_VERSION=6.2 \
dh_auto_configure -- \
--disable-static \
--includedir=$(_includedir)/globus \
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-gass-copy/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globus-gass-copy (10.3-2+gct.@distro@) @distro@; urgency=medium

* Bump GCT release version to 6.2

-- Mattias Ellert <[email protected]> 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
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/globus-gass-copy/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ configure-stamp:

dh_autoreconf

GLOBUS_VERSION=6.0 \
GLOBUS_VERSION=6.2 \
dh_auto_configure -- \
--disable-static \
--includedir=$(_includedir)/globus \
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-gram-job-manager/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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
Expand Down
1 change: 1 addition & 0 deletions packaging/debian/globus-gram-job-manager/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ configure-stamp:

dh_autoreconf

GLOBUS_VERSION=6.2 \
dh_auto_configure -- \
--disable-static \
--includedir=$(_includedir)/globus \
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-gridftp-server/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
globus-gridftp-server (13.9-2+gct.@distro@) @distro@; urgency=medium

* Bump GCT release version to 6.2

-- Mattias Ellert <[email protected]> Mon, 05 Nov 2018 10:21:36 +0100

globus-gridftp-server (13.9-1+gct.@distro@) @distro@; urgency=medium

* Fix data_node restrict path
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/globus-gridftp-server/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/globus-gsi-cert-utils/debian/changelog.in
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/globus-gsi-cert-utils/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ configure-stamp:

dh_autoreconf

GLOBUS_VERSION=6.0 \
GLOBUS_VERSION=6.2 \
dh_auto_configure -- \
--disable-static \
--includedir=$(_includedir)/globus \
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion packaging/fait_accompli/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0
6.2
7 changes: 5 additions & 2 deletions packaging/fedora/globus-common.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 <[email protected]> - 18.0-2
- Bump GCT release version to 6.2

* Sat Mar 31 2018 Mattias Ellert <[email protected]> - 18.0-1
- First Grid Community Toolkit release
- Move globus-makefile-header to devel package
Expand Down
7 changes: 5 additions & 2 deletions packaging/fedora/globus-ftp-client.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -153,6 +153,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
%doc %{_pkgdocdir}/GLOBUS_LICENSE

%changelog
* Mon Nov 05 2018 Mattias Ellert <[email protected]> - 9.1-2
- Bump GCT release version to 6.2

* Sat May 05 2018 Mattias Ellert <[email protected]> - 9.1-1
- Use 2048 bit RSA key for tests

Expand Down
7 changes: 5 additions & 2 deletions packaging/fedora/globus-gass-copy.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -170,6 +170,9 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1
%doc %{_pkgdocdir}/GLOBUS_LICENSE

%changelog
* Mon Nov 05 2018 Mattias Ellert <[email protected]> - 10.3-2
- Bump GCT release version to 6.2

* Mon Sep 03 2018 Mattias Ellert <[email protected]> - 10.3-1
- Split guc-cc.pl test into smaller tests

Expand Down
7 changes: 5 additions & 2 deletions packaging/fedora/globus-gram-job-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 <[email protected]> - 15.1-2
- Bump GCT release version to 6.2

* Sat May 05 2018 Mattias Ellert <[email protected]> - 15.1-1
- Use 2048 bit RSA key for tests

Expand Down
9 changes: 6 additions & 3 deletions packaging/fedora/globus-gridftp-server.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -218,6 +218,9 @@ fi
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Mon Nov 05 2018 Mattias Ellert <[email protected]> - 13.9-2
- Bump GCT release version to 6.2

* Mon Sep 10 2018 Globus Toolkit <[email protected]> - 13.9-1
- Fix data_node restrict path

Expand Down
7 changes: 5 additions & 2 deletions packaging/fedora/globus-gsi-cert-utils.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -180,6 +180,9 @@ make %{?_smp_mflags} check VERBOSE=1
%doc %{_pkgdocdir}/GLOBUS_LICENSE

%changelog
* Mon Nov 05 2018 Mattias Ellert <[email protected]> - 10.1-2
- Bump GCT release version to 6.2

* Fri Oct 19 2018 Mattias Ellert <[email protected]> - 10.1-1
- Fix broken subject in grid-cert-request

Expand Down
1 change: 0 additions & 1 deletion packaging/fedora/myproxy.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down

0 comments on commit cc01aa4

Please sign in to comment.