X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=glusterfs.spec;h=2b8081cb7d96cb20fdbf7bfc982533732b731232;hb=e1b4a0f2d418d67c6f482d606d79701824c49841;hp=514bdd35401d117351232dbe8f834f662f950ff4;hpb=66b0f3bb9ebbd3310fbf25e6e229f96876388ac2;p=packages%2Fglusterfs.git diff --git a/glusterfs.spec b/glusterfs.spec index 514bdd3..2b8081c 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -15,36 +15,38 @@ Summary: Clustered File Storage that can scale to peta bytes Summary(pl.UTF-8): Klastrowy system przechowywania plików skalujący się do petabajtów Name: glusterfs -Version: 3.12.9 -Release: 3 +Version: 6.10 +Release: 2 License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs) Group: Applications/System -Source0: https://download.gluster.org/pub/gluster/glusterfs/3.12/%{version}/glusterfs-%{version}.tar.gz -# Source0-md5: 18f639e98e4c130365b48576cbf01aae +Source0: https://download.gluster.org/pub/gluster/glusterfs/6/%{version}/glusterfs-%{version}.tar.gz +# Source0-md5: 43e4e6c017cb2ade77bc644034146215 Source1: glusterfsd.init Patch0: %{name}-noquiet.patch -Patch1: %{name}-python.patch -Patch3: interpreters.patch URL: https://www.gluster.org/ BuildRequires: acl-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: bison #BuildRequires: cmocka-devel >= 1.0.1 for unittest +BuildRequires: curl-devel # for bd-xlator BuildRequires: device-mapper-devel >= 2.02.79 BuildRequires: flex BuildRequires: libaio-devel %{?with_ibverbs:BuildRequires: libibverbs-devel >= 1.0.4} %{?with_ibverbs:BuildRequires: librdmacm-devel >= 1.0.15} +BuildRequires: libselinux-devel +BuildRequires: libtirpc-devel BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: libxml2-devel >= 1:2.6.19 BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: python >= 1:2.4 -BuildRequires: python-devel >= 1:2.4 +BuildRequires: python3 >= 1:3.2 +BuildRequires: python3-devel >= 1:3.2 BuildRequires: readline-devel +BuildRequires: rpcsvc-proto BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.228 BuildRequires: sed >= 4.0 @@ -122,6 +124,7 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} # -lfl Requires: flex +Requires: libtirpc-devel Requires: openssl-devel Obsoletes: glusterfs-static @@ -131,17 +134,18 @@ This package provides the development files for GlusterFS library. %description devel -l pl.UTF-8 Ten pakiet udostępnia pliki programistyczne biblioteki GlusterFS-a. -%package -n python-gluster -Summary: Python interface to GlusterFS libraries -Summary(pl.UTF-8): Interfejs Pythona do bibliotek GlusterFS +%package -n python3-gluster +Summary: Python 3 interface to GlusterFS libraries +Summary(pl.UTF-8): Interfejs Pythona 3 do bibliotek GlusterFS Group: Libraries/Python Requires: %{name}-libs = %{version}-%{release} +Obsoletes: python-gluster < 6.6 -%description -n python-gluster -Python interface to GlusterFS libraries. +%description -n python3-gluster +Python 3 interface to GlusterFS libraries. -%description -n python-gluster -l pl.UTF-8 -Interfejs Pythona do bibliotek GlusterFS. +%description -n python3-gluster -l pl.UTF-8 +Interfejs Pythona 3 do bibliotek GlusterFS. %package transport-ibverbs Summary: InfiniBand "verbs" transport plugins for GlusterFS @@ -165,7 +169,7 @@ Requires: %{name}-client = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} Requires(post,preun): /sbin/chkconfig Requires: rc-scripts -Requires: python-modules +Requires: python3-modules %description server This package provides the glusterfs server daemon. @@ -204,9 +208,9 @@ Summary: GlusterFS Events Summary(pl.UTF-8): Obsługa zdarzeń dla GlusterFS-a Group: Applications/File Requires: %{name}-server = %{version}-%{release} -Requires: python-gluster = %{version}-%{release} -Requires: python-prettytable -Requires: python-requests +Requires: python3-gluster = %{version}-%{release} +Requires: python3-prettytable +Requires: python3-requests %description events GlusterFS Events. @@ -219,8 +223,8 @@ Summary: GlusterFS Geo-replication Summary(pl.UTF-8): Geo-replikacja dla GlusterFS-a Group: Applications/File Requires: %{name}-server = %{version}-%{release} -Requires: python-gluster = %{version}-%{release} -Requires: python-prettytable +Requires: python3-gluster = %{version}-%{release} +Requires: python3-prettytable Requires: rsync %description geo-replication @@ -229,6 +233,27 @@ GlusterFS support for geo-replication. %description geo-replication -l pl.UTF-8 Obsługa geo-replikacji dla GlusterFS-a. +%package thin-arbiter +Summary: GlusterFS thin-arbiter module +Summary(pl.UTF-8): Moduł thin-arbiter dla GlusterFS-a +Group: Applications/File +Requires: %{name}-server = %{version}-%{release} + +%description thin-arbiter +This package provides a tie-breaker functionality to GlusterFS +replicate volume. It includes translators required to provide the +functionality, and also few other scripts required for getting the +setup done. + +This package provides the glusterfs thin-arbiter translator. + +%description thin-arbiter -l pl.UTF-8 +Ten pakiet dodaje funkcję dogrywki do replikacji wolumenów GlusterFS. +Zawiera moduły tłumaczące wymagane do zapewniania tej funkcji oraz +kilka skryptów wymaganych do konfiguracji. + +Ten pakiet zawiera moduł tłumaczący thin-arbiter. + %package -n emacs-glusterfs-mode Summary: Emacs mode to edit GlusterFS configuration Summary(pl.UTF-8): Tryb Emacsa do edycji konfiguracji GlusterFS-a @@ -258,8 +283,6 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch3 -p1 %build %{__libtoolize} @@ -268,8 +291,10 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a. %{__autoheader} %{__automake} %configure \ + PYTHON=%{__python3} \ %{?with_system_fuse:--disable-fusermount} \ --disable-silent-rules \ + --enable-gnfs \ %{!?with_ibverbs:--disable-ibverbs} \ --enable-systemtap%{!?with_systemtap:=no} \ --with-initdir=/etc/rc.d/init.d @@ -294,15 +319,12 @@ install -d $RPM_BUILD_ROOT%{_datadir}/{emacs/site-lisp,vim/syntax} %{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*/*.la -%{__rm} $RPM_BUILD_ROOT%{_libdir}/glusterfs/%{version}/*/*/*/*.la %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/glusterfs/benchmarking %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/glusterfs/python/syncdaemon/README.md # example, installed as /var/lib/glusterd/groups/virt %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/glusterfs/group-virt.example -%py_postclean - %clean rm -rf $RPM_BUILD_ROOT @@ -345,6 +367,9 @@ fi %attr(755,root,root) %{_libdir}/glusterfs/%{version}/auth/addr.so %attr(755,root,root) %{_libdir}/glusterfs/%{version}/auth/login.so +%dir %{_libdir}/glusterfs/%{version}/cloudsync-plugins +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/cloudsync-plugins/cloudsyncs3.so + %dir %{_libdir}/glusterfs/%{version}/rpc-transport %attr(755,root,root) %{_libdir}/glusterfs/%{version}/rpc-transport/socket.so @@ -354,32 +379,27 @@ fi %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/cluster/*.so %dir %{_libdir}/glusterfs/%{version}/xlator/debug %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/debug/*.so -%dir %{_libdir}/glusterfs/%{version}/xlator/encryption -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/encryption/*.so* %dir %{_libdir}/glusterfs/%{version}/xlator/features -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/*.so* -%dir %{_libdir}/glusterfs/%{version}/xlator/features/glupy -%{_libdir}/glusterfs/%{version}/xlator/features/glupy/*.py* +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/*.so +%exclude %{_libdir}/glusterfs/%{version}/xlator/features/thin-arbiter.so %dir %{_libdir}/glusterfs/%{version}/xlator/mgmt %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mgmt/glusterd.so %dir %{_libdir}/glusterfs/%{version}/xlator/mount %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mount/api.so %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/mount/fuse.so -#%dir %{_libdir}/glusterfs/%{version}/xlator/nfs -#%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/nfs/server.so +%dir %{_libdir}/glusterfs/%{version}/xlator/nfs +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/nfs/server.so %dir %{_libdir}/glusterfs/%{version}/xlator/performance -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/performance/*.so* +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/performance/*.so +%dir %{_libdir}/glusterfs/%{version}/xlator/playground +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/playground/template.so %dir %{_libdir}/glusterfs/%{version}/xlator/protocol -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/*.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/client.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/protocol/server.so %dir %{_libdir}/glusterfs/%{version}/xlator/storage -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/storage/*.so +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/storage/posix.so %dir %{_libdir}/glusterfs/%{version}/xlator/system %attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/system/posix-acl.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/features -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/testing/features/*.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/performance -%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/testing/performance/*.so %if "%{_libexecdir}" != "%{_libdir}" %dir %{_libexecdir}/glusterfs @@ -391,18 +411,22 @@ fi %attr(755,root,root) %{_libexecdir}/glusterfs/glusterfind/brickfind.py %attr(755,root,root) %{_libexecdir}/glusterfs/glusterfind/changelog.py %attr(755,root,root) %{_libexecdir}/glusterfs/glusterfind/nodeagent.py -%{_libexecdir}/glusterfs/glusterfind/__init__.py* -%{_libexecdir}/glusterfs/glusterfind/changelogdata.py* -%{_libexecdir}/glusterfs/glusterfind/conf.py* -%{_libexecdir}/glusterfs/glusterfind/libgfchangelog.py* -%{_libexecdir}/glusterfs/glusterfind/main.py* -%{_libexecdir}/glusterfs/glusterfind/utils.py* +%{_libexecdir}/glusterfs/glusterfind/__init__.py +%{_libexecdir}/glusterfs/glusterfind/changelogdata.py +%{_libexecdir}/glusterfs/glusterfind/conf.py +%{_libexecdir}/glusterfs/glusterfind/gfind_py2py3.py +%{_libexecdir}/glusterfs/glusterfind/libgfchangelog.py +%{_libexecdir}/glusterfs/glusterfind/main.py +%{_libexecdir}/glusterfs/glusterfind/utils.py %{_libexecdir}/glusterfs/glusterfind/tool.conf +%{_libexecdir}/glusterfs/glusterfind/__pycache__ %dir %{_libexecdir}/glusterfs/python %dir %{_datadir}/glusterfs %dir %{_datadir}/glusterfs/scripts +#%attr(755,root,root) %{_datadir}/glusterfs/scripts/control-cpu-load.sh +#%attr(755,root,root) %{_datadir}/glusterfs/scripts/control-mem.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh @@ -417,8 +441,6 @@ fi %attr(755,root,root) %ghost %{_libdir}/libgfapi.so.0 %attr(755,root,root) %{_libdir}/libgfchangelog.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgfchangelog.so.0 -%attr(755,root,root) %{_libdir}/libgfdb.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgfdb.so.0 %attr(755,root,root) %{_libdir}/libgfrpc.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgfrpc.so.0 %attr(755,root,root) %{_libdir}/libgfxdr.so.*.*.* @@ -430,35 +452,31 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgfapi.so %attr(755,root,root) %{_libdir}/libgfchangelog.so -%attr(755,root,root) %{_libdir}/libgfdb.so %attr(755,root,root) %{_libdir}/libgfrpc.so %attr(755,root,root) %{_libdir}/libgfxdr.so %attr(755,root,root) %{_libdir}/libglusterfs.so %{_libdir}/libgfapi.la %{_libdir}/libgfchangelog.la -%{_libdir}/libgfdb.la %{_libdir}/libgfrpc.la %{_libdir}/libgfxdr.la %{_libdir}/libglusterfs.la %dir %{_includedir}/glusterfs %{_includedir}/glusterfs/api %{_includedir}/glusterfs/gfchangelog -%{_includedir}/glusterfs/gfdb %{_includedir}/glusterfs/rpc %{_includedir}/glusterfs/server %{_includedir}/glusterfs/*.h %{_pkgconfigdir}/glusterfs-api.pc %{_pkgconfigdir}/libgfchangelog.pc -%{_pkgconfigdir}/libgfdb.pc -%files -n python-gluster +%files -n python3-gluster %defattr(644,root,root,755) -%dir %{py_sitescriptdir}/gluster -%{py_sitescriptdir}/gluster/*.py[co] -%{py_sitescriptdir}/gluster/cliutils -%{py_sitescriptdir}/gluster/glupy +%dir %{py3_sitescriptdir}/gluster +%{py3_sitescriptdir}/gluster/__init__.py +%{py3_sitescriptdir}/gluster/__pycache__ +%{py3_sitescriptdir}/gluster/cliutils # created only when using py_build/py_install in xlators/features/glupy/src -#%{py_sitescriptdir}/glusterfs_glupy-%{version}-py*.egg-info +#%{py3_sitescriptdir}/glusterfs_glupy-%{version}-py*.egg-info %if %{with ibverbs} %files transport-ibverbs @@ -469,9 +487,12 @@ fi %files server %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/glusterfsd.vol +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-db-workload +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-distributed-virt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-gluster-block %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-metadata-cache %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-nl-cache +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/group-samba %attr(754,root,root) /etc/rc.d/init.d/glusterfsd %attr(755,root,root) %{_sbindir}/conf.py %attr(755,root,root) %{_sbindir}/gcron.py @@ -479,19 +500,25 @@ fi %attr(755,root,root) %{_sbindir}/gluster-setgfid2path %attr(755,root,root) %{_sbindir}/glusterd %attr(755,root,root) %{_sbindir}/snap_scheduler.py +#%attr(755,root,root) %{_libexecdir}/glusterfs/mount-shared-storage.sh %{_mandir}/man8/gluster-setgfid2path.8* %{_mandir}/man8/glusterd.8* %dir %{_var}/lib/glusterd %dir %{_var}/lib/glusterd/groups +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/db-workload +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/distributed-virt %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/gluster-block %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/metadata-cache %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/nl-cache +%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/samba %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/virt %dir %{_var}/lib/glusterd/hooks %dir %{_var}/lib/glusterd/hooks/1 %dir %{_var}/lib/glusterd/hooks/1/add-brick %dir %{_var}/lib/glusterd/hooks/1/add-brick/post +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/S10selinux-label-brick.sh +%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh %dir %{_var}/lib/glusterd/hooks/1/add-brick/pre %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh @@ -536,19 +563,21 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/glusterfs/eventsconfig.json %attr(755,root,root) %{_sbindir}/gluster-eventsapi %attr(755,root,root) %{_sbindir}/glustereventsd -%dir %{_libexecdir}/glusterfs/events -%attr(755,root,root) %{_libexecdir}/glusterfs/events/glustereventsd.py -%{_libexecdir}/glusterfs/events/__init__.py* -%{_libexecdir}/glusterfs/events/eventsapiconf.py* -%{_libexecdir}/glusterfs/events/eventtypes.py* -%{_libexecdir}/glusterfs/events/gf_event.py* -%{_libexecdir}/glusterfs/events/handlers.py* -%{_libexecdir}/glusterfs/events/utils.py* -%{_libexecdir}/glusterfs/peer_eventsapi.py* +%dir %{_libexecdir}/glusterfs/gfevents +%attr(755,root,root) %{_libexecdir}/glusterfs/gfevents/glustereventsd.py +%{_libexecdir}/glusterfs/gfevents/__init__.py +%{_libexecdir}/glusterfs/gfevents/eventsapiconf.py +%{_libexecdir}/glusterfs/gfevents/eventtypes.py +%{_libexecdir}/glusterfs/gfevents/gf_event.py +%{_libexecdir}/glusterfs/gfevents/handlers.py +%{_libexecdir}/glusterfs/gfevents/utils.py +%{_libexecdir}/glusterfs/gfevents/__pycache__ +%{_libexecdir}/glusterfs/peer_eventsapi.py %{_datadir}/glusterfs/scripts/eventsdash.py %files geo-replication %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/gsyncd.conf %attr(755,root,root) %{_sbindir}/gfind_missing_files %attr(755,root,root) %{_sbindir}/gluster-georep-sshkey %attr(755,root,root) %{_sbindir}/gluster-mountbroker @@ -562,8 +591,8 @@ fi %dir %{_libexecdir}/glusterfs/gfind_missing_files %attr(755,root,root) %{_libexecdir}/glusterfs/gfind_missing_files/* %dir %{_libexecdir}/glusterfs/python/syncdaemon -# gsyncd.py is a script, the rest probably don't require *.py -%{_libexecdir}/glusterfs/python/syncdaemon/*.py* +%{_libexecdir}/glusterfs/python/syncdaemon/*.py +%{_libexecdir}/glusterfs/python/syncdaemon/__pycache__ %attr(755,root,root) %{_datadir}/glusterfs/scripts/generate-gfid-file.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/get-gfid.sh %attr(755,root,root) %{_datadir}/glusterfs/scripts/gsync-sync-gfid @@ -574,6 +603,12 @@ fi %dir %{_var}/lib/glusterd/hooks/1/gsync-create/post %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%files thin-arbiter +%defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/thin-arbiter.vol +%attr(755,root,root) %{_libdir}/glusterfs/%{version}/xlator/features/thin-arbiter.so +%attr(755,root,root) %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh + %files -n emacs-glusterfs-mode %defattr(644,root,root,755) %{_datadir}/emacs/site-lisp/glusterfs-mode.el