From b22c14b7ac85905f6217aaa37bf0499b68a6ffa2 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Nov 23 2016 15:56:47 +0000 Subject: 3.8.6 GA --- diff --git a/glusterfs.spec b/glusterfs.spec index b717637..d8ab51f 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 rc2 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -90,11 +90,6 @@ %global _with_tmpfilesdir --without-tmpfilesdir %endif -# Eventing -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -%global _without_events --disable-events -%endif - # 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())")} @@ -115,7 +110,6 @@ # can't seem to make a generic macro that works %global _init_glusterd %{_unitdir}/glusterd.service %global _init_glusterfsd %{_unitdir}/glusterfsd.service -%global _init_glustereventsd %{_unitdir}/glustereventsd.service %else %global _init_enable() /sbin/chkconfig --add %1 ; %global _init_disable() /sbin/chkconfig --del %1 ; @@ -126,7 +120,6 @@ # can't seem to make a generic macro that works %global _init_glusterd %{_sysconfdir}/init.d/glusterd %global _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd -%global _init_glustereventsd %{_sysconfdir}/init.d/glustereventsd %endif %if ( 0%{_for_fedora_koji_builds} ) @@ -167,8 +160,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.9.0 -Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.8.6 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -178,7 +171,7 @@ Vendor: Gluster Community %endif License: GPLv2 or LGPLv3+ Group: System Environment/Base -URL: http://gluster.readthedocs.io/en/latest/ +URL: http://www.gluster.org/docs/index.php/GlusterFS %if ( 0%{_for_fedora_koji_builds} ) Source0: http://bits.gluster.org/pub/gluster/%{name}/src/%{name}-%{version}%{?prereltag}.tar.gz Source1: glusterd.sysconfig @@ -189,7 +182,6 @@ Source8: glusterfsd.init %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif -Patch0: glusterfs-3.9.0rc2.xlators.crypt.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -211,6 +203,7 @@ BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: libaio-devel libacl-devel BuildRequires: python-devel +BuildRequires: python-ctypes BuildRequires: userspace-rcu-devel >= 0.7 %if ( 0%{?rhel} && 0%{?rhel} < 7 ) BuildRequires: automake @@ -344,38 +337,13 @@ is in user space and easily manageable. This package provides the development libraries and include files. - -%if ( 0%{!?_without_events:1} ) -%package events -Summary: GlusterFS Events -Group: Applications/File -Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: python python-fasteners python-requests python-flask -Requires: python-prettytable -Requires: python-gluster = %{version}-%{release} -%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) -Requires: python-argparse -%endif - -%description events -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 GlusterFS Events -%endif - %package extra-xlators Summary: Extra Gluster filesystem Translators Group: Applications/File # We need python-gluster rpm for gluster module's __init__.py in Python # site-packages area Requires: python-gluster = %{version}-%{release} -Requires: python +Requires: python python-ctypes %description extra-xlators GlusterFS is a distributed file-system capable of scaling to several @@ -424,8 +392,6 @@ Requires: pcs, dbus %if ( 0%{?rhel} && 0%{?rhel} == 6 ) Requires: cman, pacemaker, corosync %endif -# we need portblock resource-agent -Requires: %{_prefix}/lib/ocf/resource.d/portblock %description ganesha GlusterFS is a distributed file-system capable of scaling to several @@ -445,8 +411,7 @@ 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: python python-ctypes Requires: rsync %description geo-replication @@ -624,7 +589,6 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} -%patch0 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -644,8 +608,7 @@ export CFLAGS %{?_without_ocf} \ %{?_without_rdma} \ %{?_without_syslog} \ - %{?_without_tiering} \ - %{?_without_events} + %{?_without_tiering} # fix hardening and remove rpath in shlibs %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) @@ -787,12 +750,6 @@ exit 0 %post api -p /sbin/ldconfig -%if ( 0%{!?_without_events:1} ) -%post events -%_init_restart glustereventsd -exit 0 -%endif - %if ( 0%{?rhel} == 5 ) %post fuse modprobe fuse @@ -890,17 +847,6 @@ exit 0 ##----------------------------------------------------------------------------- ## All %%preun should be placed here and keep them sorted ## -%if ( 0%{!?_without_events:1} ) -%preun events -if [ $1 -eq 0 ]; then - if [ -f %_init_glustereventsd ]; then - %_init_stop glustereventsd - %_init_disable glustereventsd - fi -fi -exit 0 -%endif - %preun server if [ $1 -eq 0 ]; then if [ -f %_init_glusterfsd ]; then @@ -984,7 +930,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/fdl.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so @@ -1025,9 +970,8 @@ 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/features/ganesha.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2c.so - %files devel %dir %{_includedir}/glusterfs @@ -1085,18 +1029,13 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-georep %{_sbindir}/gfind_missing_files -%{_sbindir}/gluster-mountbroker %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/python/syncdaemon/* %{_libexecdir}/glusterfs/gverify.sh %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh %{_libexecdir}/glusterfs/peer_gsec_create %{_libexecdir}/glusterfs/peer_mountbroker -%{_libexecdir}/glusterfs/peer_mountbroker.py* %{_libexecdir}/glusterfs/gfind_missing_files -%{_libexecdir}/glusterfs/peer_georep-sshkey.py* -%{_sbindir}/gluster-georep-sshkey - %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf @@ -1126,7 +1065,6 @@ exit 0 # 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 %if ( 0%{!?_without_rdma:1} ) %files rdma @@ -1151,7 +1089,6 @@ exit 0 %doc extras/clear_xattrs.sh # sysconf %config(noreplace) %{_sysconfdir}/glusterfs -%exclude %{_sysconfdir}/glusterfs/eventsconfig.json %dir %{_localstatedir}/run/gluster %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %if ( 0%{_for_fedora_koji_builds} ) @@ -1174,12 +1111,6 @@ exit 0 %{_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 -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbrc.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbr.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2s.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-ds.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-mds.so -%{_libdir}/libposix2common.so %if ( 0%{!?_without_tiering:1} ) %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so %endif @@ -1204,7 +1135,6 @@ exit 0 # snap_scheduler %{_sbindir}/snap_scheduler.py %{_sbindir}/gcron.py -%{_sbindir}/conf.py # /var/lib/glusterd, e.g. hookscripts, etc. %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info @@ -1277,29 +1207,9 @@ exit 0 %{_prefix}/lib/firewalld/services/glusterfs.xml %endif -%{_sbindir}/gf_logdump -%{_sbindir}/gf_recon - -# Events -%if ( 0%{!?_without_events:1} ) -%files events -%config(noreplace) %{_sysconfdir}/glusterfs/eventsconfig.json -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/events -%{_libexecdir}/glusterfs/events -%{_libexecdir}/glusterfs/peer_eventsapi.py* -%{_sbindir}/glustereventsd -%{_sbindir}/gluster-eventsapi -%{_datadir}/glusterfs/scripts/eventsdash.py* -%if ( 0%{?_with_systemd:1} ) -%{_unitdir}/glustereventsd.service -%else -%{_sysconfdir}/init.d/glustereventsd -%endif -%endif - %changelog -* Wed Oct 26 2016 Kaleb S. KEITHLEY - 3.9.0-0.1rc2 -- 3.9.0rc2 +* Wed Nov 23 2016 Kaleb S. KEITHLEY - 3.8.6-1 +- 3.8.6 GA * Thu Oct 13 2016 Kaleb S. KEITHLEY - 3.8.5-1 - 3.8.5 GA @@ -1319,12 +1229,9 @@ exit 0 * Fri Jul 8 2016 Kaleb S. KEITHLEY - 3.8.1-1 - 3.8.1 GA -* Mon Jun 27 2016 Kaleb S. KEITHLEY - 3.8.0-3 +* Mon Jun 27 2016 Kaleb S. KEITHLEY - 3.8.0-2 - 3.8.0 GA, http://review.gluster.org/#/c/14779/ -* Wed Jun 22 2016 Kaleb S. KEITHLEY - 3.8.0-2 -- 3.8.0 GA, rebuild after userspace-rcu SONAME bump - * Tue Jun 14 2016 Kaleb S. KEITHLEY - 3.8.0-1 - 3.8.0 GA diff --git a/sources b/sources index 82d6821..8c927cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f15980be6b404008169d512bbc7ebec8 glusterfs-3.9.0rc2.tar.gz +0bbc6128097ab06945c92aa3145a4352 glusterfs-3.8.6.tar.gz