1
0
forked from pool/glusterfs

Accepting request 534404 from home:scarabeus_iv

This replaces sr#533686

- Update to version 3.8.15
  * fixes build with OpenSSL 1.1 (bsc#1055466)
  * Mandatory lock support for Multiprotocol environment
  * Gluster/NFS disabled by default
  * Geo-replication for Sharded Volumes
  * Tiering aware Geo-replication
  * Enhance Quota enable/disable in glusterd
  * Automagic unsplit-brain by [ctime|mtime|size|majority] for AFR
  * Granular Entry self-heal for AFR
  * Tons of bugfixes
  * for more details see the NEWS file
- spec cleanup
- Install License files/docu

OBS-URL: https://build.opensuse.org/request/show/534404
OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=40
This commit is contained in:
Jan Engelhardt 2017-10-17 12:06:20 +00:00 committed by Git OBS Bridge
parent a9a7ea4a2f
commit 696d15a5bf
4 changed files with 141 additions and 113 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39519ba2ba84273e6e28b4cb94ef74defc326b7c1f6ea33f0029ddc225b8110b
size 6097034

3
glusterfs-3.8.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22c293cb5d7bb9106dccb0a8e4c446c19f014af0b2c6b37396525819288206bb
size 8570170

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Aug 23 15:58:34 UTC 2017 - vcizek@suse.com
- Update to version 3.8.15
* fixes build with OpenSSL 1.1 (bsc#1055466)
* Mandatory lock support for Multiprotocol environment
* Gluster/NFS disabled by default
* Geo-replication for Sharded Volumes
* Tiering aware Geo-replication
* Enhance Quota enable/disable in glusterd
* Automagic unsplit-brain by [ctime|mtime|size|majority] for AFR
* Granular Entry self-heal for AFR
* Tons of bugfixes
* for more details see the NEWS file
- spec cleanup
- Install License files/docu
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 27 20:38:50 UTC 2015 - scorot@free.fr Tue Oct 27 20:38:50 UTC 2015 - scorot@free.fr

View File

@ -1,7 +1,7 @@
# #
# spec file for package glusterfs # spec file for package glusterfs
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,17 @@
Name: glusterfs Name: glusterfs
Version: 3.6.6 Version: 3.8.15
Release: 0 Release: 0
Summary: Aggregating distributed file system Summary: Aggregating distributed file system
License: GPL-2.0 or LGPL-3.0+ License: GPL-2.0 OR LGPL-3.0+
Group: System/Filesystems Group: System/Filesystems
Url: http://www.gluster.org/ Url: http://www.gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/gluster/glusterfs
#Git-Clone: git://github.com/fvzwieten/lsgvt #Git-Clone: git://github.com/fvzwieten/lsgvt
Source: http://download.gluster.org/pub/gluster/glusterfs/3.6/%version/%name-%version.tar.gz Source: http://download.gluster.org/pub/gluster/glusterfs/3.8/%{version}/%{name}-%{version}.tar.gz
Patch1: glusterfs-date.diff Patch1: glusterfs-date.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: acl-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -39,21 +38,15 @@ BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python
BuildRequires: readline-devel BuildRequires: readline-devel
%if 0%{?sles_version} == 11 BuildRequires: systemd-rpm-macros
BuildRequires: fuse-devel >= 2.6.5
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
%else
BuildRequires: pkgconfig(fuse) >= 2.6.5 BuildRequires: pkgconfig(fuse) >= 2.6.5
BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liburcu)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(uuid)
%endif %{?systemd_requires}
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
%endif
#Requires: python
%description %description
GlusterFS is a clustered file-system capable of scaling to several GlusterFS is a clustered file-system capable of scaling to several
@ -110,15 +103,39 @@ Group: System/Libraries
GlusterFS is a clustered file-system capable of scaling to several GlusterFS is a clustered file-system capable of scaling to several
petabytes. petabytes.
%package -n libgfdb0
Summary: GlusterFS's database library
Group: System/Libraries
%description -n libgfdb0
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n python-gluster
Summary: GlusterFS python library
Group: System/Filesystems
%description -n python-gluster
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package ganesha
Summary: NFS-Ganesha configuration
Group: System/Libraries
%description ganesha
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package devel %package devel
Summary: Development files for glusterfs Summary: Development files for glusterfs
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %name = %version Requires: %{name} = %{version}
Requires: libgfapi0 = %version Requires: libgfapi0 = %{version}
Requires: libgfchangelog0 = %version Requires: libgfchangelog0 = %{version}
Requires: libgfrpc0 = %version Requires: libgfrpc0 = %{version}
Requires: libgfxdr0 = %version Requires: libgfxdr0 = %{version}
Requires: libglusterfs0 = %version Requires: libglusterfs0 = %{version}
%description devel %description devel
GlusterFS is a clustered file-system capable of scaling to several GlusterFS is a clustered file-system capable of scaling to several
@ -129,89 +146,69 @@ links.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1 %patch1 -p1
%build %build
[ ! -e gf-error-codes.h ] && ./autogen.sh ./autogen.sh
%configure --disable-static %configure \
# This section is not parallel safe or so due to bison/lex --disable-static \
make -C libglusterfs/src --disable-silent-rules
make %{?_smp_mflags}; make %{?_smp_mflags}
%install %install
b="%buildroot"; %make_install docdir="%{_docdir}/%{name}"
make install DESTDIR="$b" docdir="%_docdir/%name" find %{buildroot} -type f -name "*.la" -delete -print
find "$b/%_libdir" -type f -name "*.la" -delete;
mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd}; mkdir -p "%{buildroot}%{_localstatedir}/log"/{glusterd,glusterfs,glusterfsd};
# The things seemingly forgotten by make install. # The things seemingly forgotten by make install.
# - Manually populate devel dirs # - Manually populate devel dirs
mkdir -p "$b/%_includedir/%name"; mkdir -p "%{buildroot}%{_includedir}/%{name}";
install -pm0644 libglusterfs/src/*.h "$b/%_includedir/%name/"; install -pm0644 libglusterfs/src/*.h "%{buildroot}%{_includedir}/%{name}/";
# - hekafs wants this: # - hekafs wants this:
mkdir -p "$b/%_includedir/%name"/{rpc,server}; mkdir -p "%{buildroot}%{_includedir}/%{name}"/{rpc,server};
install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \ install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \
"$b/%_includedir/%name/rpc/"; "%{buildroot}%{_includedir}/%{name}/rpc/";
install -pm0644 xlators/protocol/server/src/*.h \ install -pm0644 xlators/protocol/server/src/*.h \
"$b/%_includedir/%name/server/"; "%{buildroot}%{_includedir}/%{name}/server/";
# - init script; there is no SuSE-release in the build env # - init script; there is no SuSE-release in the build env
mkdir -p "$b/%_initrddir"; mkdir -p "%{buildroot}%{_initddir}";
install -pm0755 extras/init.d/glusterd-SuSE "$b/%_initrddir/glusterd"; install -pm0755 extras/init.d/glusterd-SuSE "%{buildroot}%{_initddir}/glusterd";
# - wrapper umount script? # - wrapper umount script?
# - logrotate entry # - logrotate entry
mkdir -p "$b/%_localstatedir/log/%name"; mkdir -p "%{buildroot}%{_localstatedir}/log/%{name}";
# - vim syntax # - vim syntax
# - state # - state
mkdir -p "$b/%_localstatedir/lib/glusterd"; mkdir -p "%{buildroot}%{_localstatedir}/lib/glusterd";
perl -i -pe \ perl -i -pe \
's{^(\s*option working-directory )\S+}{$1 %_localstatedir/lib/glusterd}g' \ 's{^(\s*option working-directory )\S+}{$1 %{_localstatedir}/lib/glusterd}g' \
"$b/%_sysconfdir/%name/glusterd.vol"; "%{buildroot}%{_sysconfdir}/%{name}/glusterd.vol";
# Clean, but must NOT remove .la from dirs not searched by # Clean, but must NOT remove .la from dirs not searched by
# default, thus maxdepth. # default, thus maxdepth.
find "$b/%_libdir" -maxdepth 1 -type f -name "*.la" -delete; find %{buildroot} -type f -name "*.la" -delete -print
# W: wrong-file-end-of-line-encoding # W: wrong-file-end-of-line-encoding
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el; perl -i -pe 's{\x0d\x0a}{\x0a}gs' %{_docdir}/%{name}/glusterfs-mode.el;
%if 0%{?_unitdir:1} mkdir -p "%{buildroot}%{_unitdir}";
mkdir -p "$b/%_unitdir"; rm -Rf "%{buildroot}%{_initddir}"
rm -Rf "$b/%_initddir" ln -s service "%{buildroot}%{_sbindir}/rcglusterd"
ln -s service "$b/%_sbindir/rcglusterd" chmod u-s "%{buildroot}%{_bindir}/fusermount-glusterfs"
%else %fdupes %{buildroot}/%{_prefix}
ln -s "%_initddir/glusterd" "$b/%_sbindir/rcglusterd"
%endif
chmod u-s "$b/%_bindir/fusermount-glusterfs"
%fdupes %buildroot/%_prefix
%if 0%{?suse_version} >= 1210
%pre %pre
%service_add_pre glusterd.service %service_add_pre glusterd.service
%endif
%post %post
%if 0%{?suse_version} >= 1210
%service_add_post glusterd.service %service_add_post glusterd.service
%else
%fillup_and_insserv -f glusterd
%endif
%preun %preun
%if 0%{?suse_version} >= 1210
%service_del_preun glusterd.service %service_del_preun glusterd.service
%else
%stop_on_removal glusterd
%endif
%postun %postun
%if 0%{?suse_version} >= 1210
%service_del_postun glusterd.service %service_del_postun glusterd.service
%else
%insserv_cleanup
%restart_on_update glusterd
%endif
%post -n libgfapi0 -p /sbin/ldconfig %post -n libgfapi0 -p /sbin/ldconfig
%postun -n libgfapi0 -p /sbin/ldconfig %postun -n libgfapi0 -p /sbin/ldconfig
@ -223,59 +220,73 @@ chmod u-s "$b/%_bindir/fusermount-glusterfs"
%postun -n libgfxdr0 -p /sbin/ldconfig %postun -n libgfxdr0 -p /sbin/ldconfig
%post -n libglusterfs0 -p /sbin/ldconfig %post -n libglusterfs0 -p /sbin/ldconfig
%postun -n libglusterfs0 -p /sbin/ldconfig %postun -n libglusterfs0 -p /sbin/ldconfig
%post -n libgfdb0 -p /sbin/ldconfig
%postun -n libgfdb0 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %doc COPYING-GPLV2 COPYING-LGPLV3 ChangeLog NEWS README.md
%dir %_sysconfdir/%name %dir %{_sysconfdir}/%{name}
%config(noreplace) %_sysconfdir/%name/glusterd.vol %config(noreplace) %{_sysconfdir}/%{name}/glusterd.vol
%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate %config(noreplace) %{_sysconfdir}/%{name}/glusterfs-logrotate
%config %_sysconfdir/%name/gluster-rsyslog*.conf %config %{_sysconfdir}/%{name}/gluster-rsyslog*.conf
%config %_sysconfdir/%name/*.example %config %{_sysconfdir}/%{name}/*.example
%config %_sysconfdir/%name/*-logrotate %config %{_sysconfdir}/%{name}/*-logrotate
%_bindir/fusermount-glusterfs %{_bindir}/fusermount-glusterfs
/sbin/mount.%name %{_bindir}/glusterfind
%_libexecdir/%name/ /sbin/mount.%{name}
%_libdir/%name/ %{_libexecdir}/%{name}/
%_sbindir/gluster* %{_libdir}/%{name}/
%_sbindir/glfsheal %{_sbindir}/gluster*
%_sbindir/rcglusterd %{_sbindir}/glfsheal
%_datadir/glusterfs/ %{_sbindir}/rcglusterd
%_mandir/man*/* %{_sbindir}/gcron.py
%_docdir/%name %{_sbindir}/gfind_missing_files
%_localstatedir/lib/glusterd %{_sbindir}/snap_scheduler.py
%_localstatedir/log/%name %{_datadir}/glusterfs/
#%python_sitelib/gluster* %{_mandir}/man*/*
%if 0%{?_unitdir:1} %{_docdir}/%{name}
%_unitdir/glusterd.service %{_localstatedir}/lib/glusterd
%else %{_localstatedir}/log/%{name}
%_initddir/glusterd* %{_unitdir}/glusterd.service
%endif %{_libexecdir}/ocf
%_prefix/lib/ocf
%files -n libgfapi0 %files -n libgfapi0
%defattr(-,root,root) %{_libdir}/libgfapi.so.0*
%_libdir/libgfapi.so.0*
%files -n libgfchangelog0 %files -n libgfchangelog0
%defattr(-,root,root) %{_libdir}/libgfchangelog.so.0*
%_libdir/libgfchangelog.so.0*
%files -n libgfrpc0 %files -n libgfrpc0
%defattr(-,root,root) %{_libdir}/libgfrpc.so.0*
%_libdir/libgfrpc.so.0*
%files -n libgfxdr0 %files -n libgfxdr0
%defattr(-,root,root) %{_libdir}/libgfxdr.so.0*
%_libdir/libgfxdr.so.0*
%files -n libglusterfs0 %files -n libglusterfs0
%defattr(-,root,root) %{_libdir}/libglusterfs.so.0*
%_libdir/libglusterfs.so.0*
%files -n libgfdb0
%{_libdir}/libgfdb.so.0*
%files ganesha
%dir %{_sysconfdir}/ganesha
%dir %{_libexecdir}/ganesha
%{_sysconfdir}/ganesha/ganesha-ha.conf.sample
%{_libexecdir}/ganesha/copy-export-ganesha.sh
%{_libexecdir}/ganesha/create-export-ganesha.sh
%{_libexecdir}/ganesha/dbus-send.sh
%{_libexecdir}/ganesha/ganesha-ha.sh
%{_libexecdir}/ganesha/generate-epoch.py
%files -n python-gluster
%dir %{python_sitelib}/gluster
%dir %{python_sitelib}/gluster/glupy
%{python_sitelib}/gluster/__init__.*
%{python_sitelib}/gluster/glupy/__init__.*
%files devel %files devel
%defattr(-,root,root) %{_includedir}/%{name}
%_includedir/%name %{_libdir}/*.so
%_libdir/*.so %{_libdir}/pkgconfig/*.pc
%_libdir/pkgconfig/*.pc
%changelog %changelog