diff --git a/glusterfs.spec b/glusterfs.spec index 00eb8a2..d0cf69a 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -6,8 +6,8 @@ %global _for_fedora_koji_builds 1 -# uncomment and add '%' to use the prereltag for pre-releases -# %%global dev rc1 +# uncomment and add '%' to use the %%dev for pre-releases +%global dev rc0 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -209,17 +209,17 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 6.5 -Release: 2%{?dev:%{dev}}%{?dist} +Version: 7.0 +Release: 0.1%{?dev:%{dev}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ -Release: 0.@PACKAGE_RELEASE@%{?dist}.10 +Release: 0.@PACKAGE_RELEASE@%{?dist}.8 %endif License: GPLv2 or LGPLv3+ URL: http://docs.gluster.org/ %if ( 0%{_for_fedora_koji_builds} ) -Source0: http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz +Source0: http://download.gluster.org/pub/gluster/%{name}/LATEST/%{version}%{?dev}/%{name}-%{version}%{?dev}.tar.gz Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig Source7: glusterfsd.service @@ -337,7 +337,6 @@ is in user space and easily manageable. This package provides the api include files. -%if ( 0%{!?_without_server:1} ) %package cli Summary: GlusterFS CLI Requires: %{name}-libs = %{version}-%{release} @@ -352,7 +351,6 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS is in user space and easily manageable. This package provides the GlusterFS CLI application and its man page -%endif %package client-xlators Summary: GlusterFS client-side translators @@ -683,7 +681,7 @@ functionality, and also few other scripts required for setup. This package provides the glusterfs thin-arbiter translator. %prep -%setup -q -n %{name}-%{version}%{?prereltag} +%setup -q -n %{name}-%{version}%{?dev} %if ( ! %{_usepython3} ) echo "fixing python shebangs..." for f in api events extras geo-replication libglusterfs tools xlators; do @@ -767,7 +765,7 @@ head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog cat << EOM >> ChangeLog More commit messages for this ChangeLog can be found at -https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prereltag} +https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?dev} EOM # Remove benchmarking and other unpackaged files @@ -829,11 +827,9 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs %endif -%if ( 0%{!?_without_server:1} ) ## Install bash completion for cli install -p -m 0755 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster -%endif ##----------------------------------------------------------------------------- ## All %%post should be placed here and keep them sorted @@ -1026,7 +1022,7 @@ exit 0 %endif %dir %{_localstatedir}/log/glusterfs %if ( 0%{!?_without_rdma:1} ) -%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* +%exclude %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/rdma* %endif %if ( 0%{!?_without_server:1} ) %dir %{_datadir}/glusterfs @@ -1036,46 +1032,46 @@ exit 0 %endif # xlators that are needed on the client- and on the server-side %dir %{_libdir}/glusterfs -%dir %{_libdir}/glusterfs/%{version}%{?prereltag} -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/auth - %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport - %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/delay-gen.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/sink.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so - %{_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/features/utime.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/namespace.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cloudsync.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so +%dir %{_libdir}/glusterfs/%{version}%{?dev} +%dir %{_libdir}/glusterfs/%{version}%{?dev}/auth + %{_libdir}/glusterfs/%{version}%{?dev}/auth/addr.so + %{_libdir}/glusterfs/%{version}%{?dev}/auth/login.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport + %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/socket.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/error-gen.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/delay-gen.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/io-stats.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/sink.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/trace.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/access-control.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/barrier.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cdc.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/changelog.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/utime.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/gfid-access.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/namespace.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/read-only.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/shard.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-client.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/worm.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cloudsync.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/meta.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-cache.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-threads.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/md-cache.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/open-behind.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/quick-read.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/read-ahead.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/readdir-ahead.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/stat-prefetch.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/write-behind.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/nl-cache.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/system + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/system/posix-acl.so %dir %attr(0775,gluster,gluster) %{_rundir}/gluster %dir %attr(0775,gluster,gluster) %{_rundir}/gluster/metrics %if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1} @@ -1086,8 +1082,8 @@ exit 0 %exclude %{_libdir}/*.so # libgfapi files %{_libdir}/libgfapi.* -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount/api.so %files api-devel %{_libdir}/pkgconfig/glusterfs-api.pc @@ -1096,22 +1092,21 @@ exit 0 %dir %{_includedir}/glusterfs/api %{_includedir}/glusterfs/api/* -%if ( 0%{!?_without_server:1} ) %files cli %{_sbindir}/gluster %{_mandir}/man8/gluster.8* %{_sysconfdir}/bash_completion.d/gluster -%endif %files client-xlators -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster/*.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol +%{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/client.so %files cloudsync-plugins -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins - %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsyncs3.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins + %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsyncs3.so + %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsynccvlt.so %files devel %dir %{_includedir}/glusterfs @@ -1122,18 +1117,18 @@ exit 0 %{_libdir}/pkgconfig/libgfchangelog.pc %files extra-xlators -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground/template.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quiesce.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground/template.so %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. %{_sbindir}/glusterfs %{_sbindir}/glusterfsd %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount/fuse.so /sbin/mount.glusterfs %if ( 0%{!?_without_fusermount:1} ) %{_bindir}/fusermount-glusterfs @@ -1141,8 +1136,8 @@ exit 0 %if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} ) %files gnfs -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/* +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/* %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run @@ -1150,9 +1145,9 @@ exit 0 %endif %files thin-arbiter -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-arbiter.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/thin-arbiter.so %dir %{_datadir}/glusterfs/scripts %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh %config %{_sysconfdir}/glusterfs/thin-arbiter.vol @@ -1219,8 +1214,8 @@ exit 0 %if ( 0%{!?_without_rdma:1} ) %files rdma -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport - %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* +%dir %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport + %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/rdma* %endif %if ( ! 0%{_for_fedora_koji_builds} ) @@ -1248,7 +1243,7 @@ exit 0 %exclude %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %exclude %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %if ( 0%{?_with_gnfs:1} ) -%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/* +%exclude %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/* %endif %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %if ( 0%{_for_fedora_koji_builds} ) @@ -1274,29 +1269,27 @@ exit 0 # Manpages %{_mandir}/man8/gluster-setgfid2path.8* -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features - %{_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/features/sdfs.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so - %{_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/selinux.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/arbiter.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bit-rot.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bitrot-stub.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/sdfs.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/index.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/locks.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/posix* + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-server.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/marker.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quota* + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/selinux.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/trash.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/upcall.so + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/leases.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt/glusterd.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/server.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage/posix.so # snap_scheduler %{_sbindir}/snap_scheduler.py @@ -1406,6 +1399,9 @@ exit 0 %endif %changelog +* Thu Aug 22 2019 Kaleb S. KEITHLEY - 7.0-0.1rc0 +- 7.0 RC0 + * Mon Aug 19 2019 Kaleb S. KEITHLEY - 6.5-2 - Rebuilt for Python 3.8, again diff --git a/sources b/sources index eff1213..8511800 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-6.5.tar.gz) = b7356de07e8126aea80b0489b9ac39ce0d10ea324fe38d05ff5740765e886f80fc7e6bdda9d4db1371d7b955b055cb76ea29e918e759a575db331a6436bad90f +SHA512 (glusterfs-7.0rc0.tar.gz) = 857fa70f415d66f80aa2aebd8d9994aaf11a50898a3f4c48c6a96fba3d7ee11cbdaf6f01ff15c33e39821210c4ee0f975e7bb877fce639c6d1a7831a3aae2e4a