diff --git a/glusterfs.spec b/glusterfs.spec index 584798d..4449740 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -3,7 +3,7 @@ %global _for_fedora_koji_builds 1 # uncomment and add '%' to use the prereltag for pre-releases -%global prereltag beta1 +%global prereltag beta2 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -160,7 +160,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.7.0 -Release: 0.4%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.5%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -241,16 +241,15 @@ terms of features and extensibility. It borrows a powerful concept called Translators from GNU Hurd kernel. Much of the code in GlusterFS is in user space and easily manageable. -This package includes the libglusterfs and glusterfs translator modules -common to both GlusterFS server and client framework. +This package includes the glusterfs binary, the glusterfsd daemon and the +libglusterfs and glusterfs translator modules common to both GlusterFS server +and client framework. %package api Summary: GlusterFS api library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-client-xlators = %{version}-%{release} -# we provide the Python package/namespace 'gluster' -Provides: python-gluster = %{version}-%{release} %description api GlusterFS is a distributed file-system capable of scaling to several @@ -297,6 +296,21 @@ is in user space and easily manageable. This package provides the GlusterFS CLI application and its man page +%package client-xlators +Summary: GlusterFS client-side translators +Group: Applications/File + +%description client-xlators +GlusterFS is a distributed file-system capable of scaling to several +petabytes. It aggregates various storage bricks over Infiniband RDMA +or TCP/IP interconnect into one large parallel network file +system. GlusterFS is one of the most sophisticated file systems in +terms of features and extensibility. It borrows a powerful concept +called Translators from GNU Hurd kernel. Much of the code in GlusterFS +is in user space and easily manageable. + +This package provides the translators needed on any GlusterFS client. + %package devel Summary: Development Libraries Group: Development/Libraries @@ -319,7 +333,7 @@ This package provides the development libraries and include files. Summary: Extra Gluster filesystem Translators Group: Applications/File # We need -api rpm for its __init__.py in Python site-packages area -Requires: %{name}-api = %{version}-%{release} +Requires: python-%{name} = %{version}-%{release} Requires: python python-ctypes %description extra-xlators @@ -339,10 +353,10 @@ for GlusterFS. Summary: Fuse client Group: Applications/File BuildRequires: fuse-devel +Requires: attr Requires: %{name} = %{version}-%{release} Requires: %{name}-client-xlators = %{version}-%{release} -Requires: attr Obsoletes: %{name}-client < %{version}-%{release} Provides: %{name}-client = %{version}-%{release} @@ -422,6 +436,24 @@ is in user space and easily manageable. This package provides the base GlusterFS libraries +%package -n python-gluster +Summary: GlusterFS python library +Group: Development/Tools +Requires: python + +%description -n python-gluster +GlusterFS is a distributed file-system capable of scaling to several +petabytes. It aggregates various storage bricks over Infiniband RDMA +or TCP/IP interconnect into one large parallel network file +system. GlusterFS is one of the most sophisticated file systems in +terms of features and extensibility. It borrows a powerful concept +called Translators from GNU Hurd kernel. Much of the code in GlusterFS +is in user space and easily manageable. + +This package contains the python modules of GlusterFS and own gluster +namespace. + + %if ( 0%{!?_without_rdma:1} ) %package rdma Summary: GlusterFS rdma support for ib-verbs @@ -499,7 +531,9 @@ Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release} +# some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse Requires: %{name}-fuse = %{version}-%{release} +# self-heal daemon, rebalance, nfs-server etc. are actually clients Requires: %{name}-client-xlators = %{version}-%{release} # psmisc for killall, lvm2 for snapshot, and nfs-utils and # and rpcbind/portmap for gnfs server @@ -507,7 +541,6 @@ Requires: psmisc Requires: lvm2 Requires: nfs-utils %if ( 0%{?_with_systemd:1} ) -BuildRequires: systemd-units Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -525,6 +558,10 @@ Requires: portmap %if ( 0%{?rhel} && 0%{?rhel} < 6 ) Obsoletes: %{name}-geo-replication = %{version}-%{release} %endif +%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) +Requires: python-argparse +%endif +Requires: pyxattr %description server GlusterFS is a distributed file-system capable of scaling to several @@ -537,22 +574,6 @@ is in user space and easily manageable. This package provides the glusterfs server daemon. -%package client-xlators -Summary: GlusterFS client-side translators -Group: Applications/File - -Requires: %{name}-fuse = %{version}-%{release} - -%description client-xlators -GlusterFS is a distributed file-system capable of scaling to several -petabytes. It aggregates various storage bricks over Infiniband RDMA -or TCP/IP interconnect into one large parallel network file -system. GlusterFS is one of the most sophisticated file systems in -terms of features and extensibility. It borrows a powerful concept -called Translators from GNU Hurd kernel. Much of the code in GlusterFS -is in user space and easily manageable. - -This package provides the translators needed on any GlusterFS client. %prep %setup -q -n %{name}-%{version}%{?prereltag} @@ -634,6 +655,8 @@ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd mkdir -p %{buildroot}%{_localstatedir}/run/gluster +touch %{buildroot}%{python_sitelib}/gluster/__init__.py + # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -897,7 +920,7 @@ fi /sbin/ldconfig ##----------------------------------------------------------------------------- -## All %files should be placed here and keep them sorted by groups +## All %%files should be placed here and keep them sorted by groups ## %files %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS @@ -965,6 +988,13 @@ fi %{_mandir}/man8/gluster.8* %{_sysconfdir}/bash_completion.d/gluster +%files client-xlators +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so +%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/ganesha.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/qemu-block.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so + %files devel %{_includedir}/glusterfs %exclude %{_includedir}/glusterfs/y.tab.h @@ -976,18 +1006,10 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.* -%files client-xlators -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so -%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/ganesha.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/qemu-block.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so - %files extra-xlators %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/prot_client.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/prot_dht.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/prot_server.so @@ -1019,8 +1041,8 @@ fi %files ganesha %{_sysconfdir}/ganesha/* -%{_libexecdir}/ganesha/* -%{_prefix}/lib/ocf/resource.d/heartbeat/* +%attr(0755,-,-) %{_libexecdir}/ganesha/* +%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/heartbeat/* %if ( 0%{!?_without_georeplication:1} ) %files geo-replication @@ -1056,6 +1078,11 @@ fi # libgfdb is only needed server-side %exclude %{_libdir}/libgfdb.* +%files -n python-gluster +# introducing glusterfs module in site packages. +# so that all other gluster submodules can reside in the same namespace. +%{python_sitelib}/gluster/__init__.* + %if ( 0%{!?_without_rdma:1} ) %files rdma %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* @@ -1118,6 +1145,7 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so @@ -1173,15 +1201,12 @@ fi # Incrementalapi %{_libexecdir}/glusterfs/glusterfind %{_bindir}/glusterfind -%exclude %{_libexecdir}/glusterfs/glusterfind/brickfind.pyc -%exclude %{_libexecdir}/glusterfs/glusterfind/changelog.pyc -%exclude %{_libexecdir}/glusterfs/glusterfind/nodecleanup.pyc -%exclude %{_libexecdir}/glusterfs/glusterfind/brickfind.pyo -%exclude %{_libexecdir}/glusterfs/glusterfind/changelog.pyo -%exclude %{_libexecdir}/glusterfs/glusterfind/nodecleanup.pyo %changelog +* Tue May 12 2015 Kaleb S. KEITHLEY 3.7.0-0.5beta2 +- GlusterFS 3.7.0beta2 + * Fri May 8 2015 Kaleb S. KEITHLEY 3.7.0-0.4beta1 - GlusterFS 3.7.0beta1, BZ 1195947, 1218440 diff --git a/sources b/sources index 2931980..d24f57f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a12d43b71d8b815b791bc1e33de3533e glusterfs-3.7.0beta1.tar.gz +5d36302d8c37f222f718166f52c5df11 glusterfs-3.7.0beta2.tar.gz