diff --git a/glusterfs.spec b/glusterfs.spec index 5d89795..93cd2c0 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 rc2 +%global prereltag rc0 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -97,8 +97,8 @@ # From https://fedoraproject.org/wiki/Packaging:Python#Macros %if ( 0%{?rhel} && 0%{?rhel} < 6 ) -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif %if ( 0%{?_with_systemd:1} ) @@ -167,14 +167,12 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.9.1 -Release: 1%{?prereltag:.%{prereltag}}%{?dist} -Vendor: Fedora Project +Version: 3.10.0 +Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 0.@PACKAGE_RELEASE@%{?dist}.3 -Vendor: Gluster Community %endif License: GPLv2 or LGPLv3+ Group: System Environment/Base @@ -216,7 +214,10 @@ BuildRequires: gcc make libtool BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: libaio-devel libacl-devel -BuildRequires: python-devel +BuildRequires: python2-devel +%if ( 0%{?rhel} ) +BuildRequires: python-ctypes +%endif BuildRequires: userspace-rcu-devel >= 0.7 %if ( 0%{?rhel} && 0%{?rhel} < 7 ) BuildRequires: automake @@ -356,9 +357,9 @@ This package provides the development libraries and include files. Summary: GlusterFS Events Group: Applications/File Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: python python-fasteners python-requests python-flask +Requires: python2 python2-requests Requires: python-prettytable -Requires: python-gluster = %{version}-%{release} +Requires: python2-gluster = %{version}-%{release} %if ( 0%{?rhel} && 0%{?rhel} <= 6 ) Requires: python-argparse %endif @@ -381,10 +382,13 @@ This package provides the GlusterFS Events %package extra-xlators Summary: Extra Gluster filesystem Translators Group: Applications/File -# We need python-gluster rpm for gluster module's __init__.py in Python +# We need python2-gluster rpm for gluster module's __init__.py in Python # site-packages area -Requires: python-gluster = %{version}-%{release} -Requires: python +Requires: python2-gluster = %{version}-%{release} +Requires: python2 +%if ( 0%{?rhel} ) +BuildRequires: python-ctypes +%endif %description extra-xlators GlusterFS is a distributed file-system capable of scaling to several @@ -437,6 +441,7 @@ Requires: cman, pacemaker, corosync # we need portblock resource-agent in 3.9.5 and later. Requires: resource-agents >= 3.9.5 %endif +Requires: nfs-ganesha-gluster >= 2.4.1 %description ganesha GlusterFS is a distributed file-system capable of scaling to several @@ -456,8 +461,12 @@ Summary: GlusterFS Geo-replication Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} -Requires: python python-prettytable -Requires: python-gluster = %{version}-%{release} +Requires: python2 +Requires: python-prettytable +%if ( 0%{?rhel} ) +BuildRequires: python-ctypes +%endif +Requires: python2-gluster = %{version}-%{release} Requires: rsync %description geo-replication @@ -490,25 +499,32 @@ This package provides the base GlusterFS libraries %package -n python-gluster Summary: GlusterFS python library Group: Development/Tools -License: GPLv3+ %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) ) # EL5 does not support noarch sub-packages BuildArch: noarch %endif -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 +%global _python_gluster_description \ +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. +%description -n python-gluster %{_python_gluster_description} + +%package -n python2-gluster +Summary: GlusterFS python library +Group: Development/Tools +%{?python_provide:%python_provide python2-gluster} +Requires: python2 + +%description -n python2-gluster %{_python_gluster_description} %if ( 0%{!?_without_rdma:1} ) %package rdma @@ -540,7 +556,7 @@ Requires: %{name}-server = %{version}-%{release} ## thin provisioning support Requires: lvm2 >= 2.02.89 Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng -Requires: python attr dbench file git libacl-devel net-tools +Requires: python2 attr dbench file git libacl-devel net-tools Requires: nfs-utils xfsprogs yajl %description regression-tests @@ -1027,7 +1043,6 @@ exit 0 %files client-xlators %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so -%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so @@ -1049,20 +1064,17 @@ exit 0 %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/prot_client.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/prot_dht.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/prot_server.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files -%{python_sitelib}/gluster/glupy/* +%{python2_sitelib}/gluster/glupy/* %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. %{_sbindir}/glusterfs %{_sbindir}/glusterfsd +%{_sbindir}/gf_attach %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so /sbin/mount.glusterfs @@ -1078,7 +1090,6 @@ exit 0 %files ganesha %{_sysconfdir}/ganesha/* %{_libexecdir}/ganesha/* -%{_prefix}/lib/ocf/resource.d/heartbeat/* %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh %if ( 0%{!?_without_georeplication:1} ) @@ -1123,11 +1134,11 @@ exit 0 %exclude %{_libdir}/libgfdb.* %endif -%files -n python-gluster +%files -n python2-gluster # introducing glusterfs module in site packages. # so that all other gluster submodules can reside in the same namespace. -%{python_sitelib}/gluster/__init__.* -%{python_sitelib}/gluster/cliutils +%{python2_sitelib}/gluster/__init__.* +%{python2_sitelib}/gluster/cliutils %if ( 0%{!?_without_rdma:1} ) %files rdma @@ -1138,8 +1149,9 @@ exit 0 %files regression-tests %{_prefix}/share/glusterfs/run-tests.sh %{_prefix}/share/glusterfs/tests -%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t -%exclude %{_prefix}/share/glusterfs/tests/vagrant +%{_datadir}/glusterfs/run-tests.sh +%{_datadir}/glusterfs/tests +%exclude %{_datadir}/glusterfs/tests/vagrant %endif %if ( 0%{!?_without_ocf:1} ) @@ -1171,7 +1183,6 @@ exit 0 # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a # symlink. The binary itself (and symlink) are part of the glusterfs-fuse # package, because glusterfs-server depends on that anyway. -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so @@ -1290,6 +1301,9 @@ exit 0 %endif %changelog +* Tue Feb 7 2017 Kaleb S. KEITHLEY - 3.10.0-0.1rc0 +- 3.10.0 RC0 + * Tue Jan 17 2017 Kaleb S. KEITHLEY - 3.9.1-1 - 3.9.1 GA diff --git a/sources b/sources index 08f95fa..7000c8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.9.1.tar.gz) = ffd786567be73b6b0c3569dc24769cb2bc1aed17675747d1192f96da755acde63d8f2ab8bbad6f1ba687a8484d0a9b7dd71fe0cce7fab0fa7b8b0dae9576a1cc +SHA512 (glusterfs-3.10.0rc0.tar.gz) = 5df13a5e791f92de203c82c345cc88d0472cd06c45b078b924d97a4ae954b4028b125b7a2100800797763b08b3e619ada205cc423ff29e71925171b31591b4ef