Accepting request 538665 from filesystems

- Explicitly require python2 as python3 is not yet supported (forwarded request 538636 from pluskalm)

OBS-URL: https://build.opensuse.org/request/show/538665
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2017-11-10 13:36:50 +00:00 committed by Git OBS Bridge
commit 58395d0b4d
4 changed files with 119 additions and 79 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,31 @@
-------------------------------------------------------------------
Fri Nov 3 10:10:48 UTC 2017 - mpluskal@suse.com
- Explicitly require python2 as python3 is not yet supported
-------------------------------------------------------------------
Wed Oct 18 11:28:29 UTC 2017 - vcizek@suse.com
- Add missing Requires: libacl-devel to the devel subpackage
* glfs.h #includes <sys/acl.h>
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,17 @@
Name: glusterfs
Version: 3.6.6
Version: 3.8.15
Release: 0
Summary: Aggregating distributed file system
License: GPL-2.0 or LGPL-3.0+
License: GPL-2.0 OR LGPL-3.0+
Group: System/Filesystems
Url: http://www.gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs
#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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -37,23 +36,17 @@ BuildRequires: flex
BuildRequires: libaio-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python2
BuildRequires: readline-devel
%if 0%{?sles_version} == 11
BuildRequires: fuse-devel >= 2.6.5
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(fuse) >= 2.6.5
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liburcu)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(uuid)
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
%endif
#Requires: python
%{?systemd_requires}
%description
GlusterFS is a clustered file-system capable of scaling to several
@ -110,10 +103,35 @@ Group: System/Libraries
GlusterFS is a clustered file-system capable of scaling to several
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: Python bindings for GlusterFS
Group: Development/Languages/Python
%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
Summary: Development files for glusterfs
Group: Development/Libraries/C and C++
Requires: %name = %version
Requires: libacl-devel
Requires: libgfapi0 = %version
Requires: libgfchangelog0 = %version
Requires: libgfrpc0 = %version
@ -129,89 +147,69 @@ links.
%prep
%setup -q
%patch -P 1 -p1
%patch1 -p1
%build
[ ! -e gf-error-codes.h ] && ./autogen.sh
%configure --disable-static
# This section is not parallel safe or so due to bison/lex
make -C libglusterfs/src
make %{?_smp_mflags};
./autogen.sh
%configure \
--disable-static \
--disable-silent-rules
make %{?_smp_mflags}
%install
b="%buildroot";
make install DESTDIR="$b" docdir="%_docdir/%name"
find "$b/%_libdir" -type f -name "*.la" -delete;
%make_install docdir="%_docdir/%name"
find %buildroot -type f -name "*.la" -delete -print
mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
mkdir -p "%buildroot/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd}
# The things seemingly forgotten by make install.
# - Manually populate devel dirs
mkdir -p "$b/%_includedir/%name";
install -pm0644 libglusterfs/src/*.h "$b/%_includedir/%name/";
mkdir -p "%buildroot/%_includedir/%name"
install -pm0644 libglusterfs/src/*.h "%buildroot/%_includedir/%name/"
# - 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 \
"$b/%_includedir/%name/rpc/";
"%buildroot/%_includedir/%name/rpc/"
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
mkdir -p "$b/%_initrddir";
install -pm0755 extras/init.d/glusterd-SuSE "$b/%_initrddir/glusterd";
mkdir -p "%buildroot/%_initddir"
install -pm0755 extras/init.d/glusterd-SuSE "%buildroot/%_initddir/glusterd"
# - wrapper umount script?
# - logrotate entry
mkdir -p "$b/%_localstatedir/log/%name";
mkdir -p "%buildroot/%_localstatedir/log/%name"
# - vim syntax
# - state
mkdir -p "$b/%_localstatedir/lib/glusterd";
mkdir -p "%buildroot/%_localstatedir/lib/glusterd"
perl -i -pe \
'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
# 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
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 "$b/%_unitdir";
rm -Rf "$b/%_initddir"
ln -s service "$b/%_sbindir/rcglusterd"
%else
ln -s "%_initddir/glusterd" "$b/%_sbindir/rcglusterd"
%endif
chmod u-s "$b/%_bindir/fusermount-glusterfs"
mkdir -p "%buildroot/%_unitdir"
rm -Rf "%buildroot%_initddir"
ln -s service "%buildroot%_sbindir/rcglusterd"
chmod u-s "%buildroot%_bindir/fusermount-glusterfs"
%fdupes %buildroot/%_prefix
%if 0%{?suse_version} >= 1210
%pre
%service_add_pre glusterd.service
%endif
%post
%if 0%{?suse_version} >= 1210
%service_add_post glusterd.service
%else
%fillup_and_insserv -f glusterd
%endif
%preun
%if 0%{?suse_version} >= 1210
%service_del_preun glusterd.service
%else
%stop_on_removal glusterd
%endif
%postun
%if 0%{?suse_version} >= 1210
%service_del_postun glusterd.service
%else
%insserv_cleanup
%restart_on_update glusterd
%endif
%post -n libgfapi0 -p /sbin/ldconfig
%postun -n libgfapi0 -p /sbin/ldconfig
@ -223,9 +221,11 @@ chmod u-s "$b/%_bindir/fusermount-glusterfs"
%postun -n libgfxdr0 -p /sbin/ldconfig
%post -n libglusterfs0 -p /sbin/ldconfig
%postun -n libglusterfs0 -p /sbin/ldconfig
%post -n libgfdb0 -p /sbin/ldconfig
%postun -n libgfdb0 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING-GPLV2 COPYING-LGPLV3 ChangeLog NEWS README.md
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
@ -233,47 +233,59 @@ chmod u-s "$b/%_bindir/fusermount-glusterfs"
%config %_sysconfdir/%name/*.example
%config %_sysconfdir/%name/*-logrotate
%_bindir/fusermount-glusterfs
%_bindir/glusterfind
/sbin/mount.%name
%_libexecdir/%name/
%_libdir/%name/
%_sbindir/gluster*
%_sbindir/glfsheal
%_sbindir/rcglusterd
%_sbindir/gcron.py
%_sbindir/gfind_missing_files
%_sbindir/snap_scheduler.py
%_datadir/glusterfs/
%_mandir/man*/*
%_docdir/%name
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
#%python_sitelib/gluster*
%if 0%{?_unitdir:1}
%_unitdir/glusterd.service
%else
%_initddir/glusterd*
%endif
%_prefix/lib/ocf
%_libexecdir/ocf
%files -n libgfapi0
%defattr(-,root,root)
%_libdir/libgfapi.so.0*
%files -n libgfchangelog0
%defattr(-,root,root)
%_libdir/libgfchangelog.so.0*
%files -n libgfrpc0
%defattr(-,root,root)
%_libdir/libgfrpc.so.0*
%files -n libgfxdr0
%defattr(-,root,root)
%_libdir/libgfxdr.so.0*
%files -n libglusterfs0
%defattr(-,root,root)
%_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
%defattr(-,root,root)
%_includedir/%name
%_libdir/*.so
%_libdir/pkgconfig/*.pc