From 9c45e54ceea5fdc7b6be73b4e88750561a7448085aab86a7cd3764ca0f79caef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 3 May 2018 11:55:54 +0000 Subject: [PATCH] - Update to new upstream release 4.0.2 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=52 --- glusterfs-3.12.3.tar.gz | 3 --- glusterfs-4.0.2.tar.gz | 3 +++ glusterfs.changes | 14 ++++++++++++ glusterfs.spec | 48 ++++++++++++++++++++++++----------------- 4 files changed, 45 insertions(+), 23 deletions(-) delete mode 100644 glusterfs-3.12.3.tar.gz create mode 100644 glusterfs-4.0.2.tar.gz diff --git a/glusterfs-3.12.3.tar.gz b/glusterfs-3.12.3.tar.gz deleted file mode 100644 index 584b3db..0000000 --- a/glusterfs-3.12.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3045208401b088414ea7198af3fe5ecbc6833e90f8aea68f318a0d863e76fa9d -size 7187644 diff --git a/glusterfs-4.0.2.tar.gz b/glusterfs-4.0.2.tar.gz new file mode 100644 index 0000000..ce18f48 --- /dev/null +++ b/glusterfs-4.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef32c64a7d2625b40657a5333447ccc5378248aa23c53283f2ca91a893f7c9f5 +size 7643713 diff --git a/glusterfs.changes b/glusterfs.changes index feb8eb8..55adf5f 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu May 3 11:50:05 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 4.0.2 + * GlusterD2 (GD2) is a new management daemon for Gluster-4.0, + glustercli is the command-line interface for it. + It is a preview release. GD2 is not backwards compatible with + the older GlusterD. Heterogeneous clusters running both GD2 + and GlusterD are not possible. + * Not all commands from GlusterD have been implemented for GD2. + * GD2 does not (yet) work well in 2-node clusters. + * Self Heal feature integrated for the new Volumes created + using Glusterd2. + ------------------------------------------------------------------- Thu Dec 14 18:47:07 UTC 2017 - jengelh@inai.de diff --git a/glusterfs.spec b/glusterfs.spec index ce29217..751531b 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,7 +1,7 @@ # # spec file for package glusterfs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: glusterfs -Version: 3.12.3 +Version: 4.0.2 Release: 0 Summary: Aggregating distributed file system -License: GPL-2.0 OR LGPL-3.0+ +License: GPL-2.0-only OR LGPL-3.0-or-later Group: System/Filesystems Url: http://www.gluster.org/ + #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt -Source: https://download.gluster.org/pub/gluster/glusterfs/3.12/3.12.3/glusterfs-%version.tar.gz +Source: https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-%version.tar.gz Patch1: glusterfs-tirpc.diff Patch2: 0001-build-restore-ability-to-control-verbosity-settings.patch BuildRequires: acl-devel @@ -150,43 +151,49 @@ links. %configure \ --disable-static \ --disable-silent-rules -make %{?_smp_mflags} +make %{?_smp_mflags} V=0 find . -name 'xdr_sizeof*' -type f -exec ls -lgo {} + || : %install +b="%buildroot" %make_install docdir="%_docdir/%name" -find %buildroot -type f -name "*.la" -delete -print - -mkdir -p "%buildroot/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd} +find "$b" -type f -name "*.la" -delete -print +mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd} # The things seemingly forgotten by make install. # - Manually populate devel dirs -mkdir -p "%buildroot/%_includedir/%name" -install -pm0644 libglusterfs/src/*.h "%buildroot/%_includedir/%name/" +mkdir -p "$b/%_includedir/%name" +install -pm0644 libglusterfs/src/*.h "$b/%_includedir/%name/" # - hekafs wants this: -mkdir -p "%buildroot/%_includedir/%name"/{rpc,server} +mkdir -p "$b/%_includedir/%name"/{rpc,server} install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \ - "%buildroot/%_includedir/%name/rpc/" + "$b/%_includedir/%name/rpc/" install -pm0644 xlators/protocol/server/src/*.h \ - "%buildroot/%_includedir/%name/server/" + "$b/%_includedir/%name/server/" # - wrapper umount script? # - logrotate entry -mkdir -p "%buildroot/%_localstatedir/log/%name" +mkdir -p "$b/%_localstatedir/log/%name" # - vim syntax # - state -mkdir -p "%buildroot/%_localstatedir/lib/glusterd" +mkdir -p "$b/%_localstatedir/lib/glusterd" perl -i -pe \ 's{^(\s*option working-directory )\S+}{$1 %_localstatedir/lib/glusterd}g' \ - "%buildroot/%_sysconfdir/%name/glusterd.vol" - -# Clean, but must NOT remove .la from dirs not searched by -# default, thus maxdepth. -find %buildroot -type f -name "*.la" -delete -print + "$b/%_sysconfdir/%name/glusterd.vol" # W: wrong-file-end-of-line-encoding perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el +# E: env-script-interpreter +perl -i -pe 's{#!/usr/bin/env python}{#!/usr/bin/python}' \ + "$b/%_bindir/glusterfind" \ + "$b/%_sbindirusr/gcron.py" "$b/%_sbindir/snap_scheduler.py" \ + "$b/%_libexecdir/glusterfs"/*.py "$b/%_libexecdir/glusterfs"/*/*.py \ + "$b/%_libexecdir/glusterfs/peer_mountbroker" \ + "$b/%_datadir/glusterfs/scripts"/*.py +perl -i -pe 's{#!/usr/bin/env bash}{#!/bin/bash}' \ + "$b/%_datadir/glusterfs/scripts"/*.sh + mkdir -p "%buildroot/%_unitdir" ln -s service "%buildroot/%_sbindir/rcglusterd" chmod u-s "%buildroot/%_bindir/fusermount-glusterfs" @@ -228,6 +235,7 @@ rm -f "%buildroot/%_sbindir/conf.py" %config %_sysconfdir/%name/*.example %config %_sysconfdir/%name/*-logrotate %config %_sysconfdir/%name/group-* +%config %_sysconfdir/%name/gsyncd.conf %_bindir/fusermount-glusterfs %_bindir/glusterfind /sbin/mount.%name