diff --git a/glusterfs.spec b/glusterfs.spec index 25a4520..50ec3ce 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 beta2 +%global prereltag beta3 # if you wish to compile an rpm without rdma support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma @@ -73,7 +73,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.5.0 -Release: 0.4%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.5%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -154,6 +154,9 @@ BuildRequires: lvm2-devel %if ( 0%{!?_without_qemu_block:1} ) BuildRequires: glib2-devel %endif +%if ( 0%{!?_without_georeplication:1} ) +BuildRequires: libattr-devel +%endif Obsoletes: hekafs Obsoletes: %{name}-common < %{version}-%{release} @@ -618,6 +621,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid +install -p -m 0744 extras/hook-scripts/S56glusterd-geo-rep-create-post.sh \ + %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post + find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs %clean @@ -694,12 +700,23 @@ if [ $1 -ge 1 ]; then fi %files geo-replication +%{_sysconfdir}/logrotate.d/glusterfs-georep %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/python/syncdaemon/* %{_libexecdir}/glusterfs/gverify.sh %{_libexecdir}/glusterfs/peer_add_secret_pub %{_libexecdir}/glusterfs/peer_gsec_create %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication +%dir %{_sharedstatedir}/glusterd/hooks +%dir %{_sharedstatedir}/glusterd/hooks/1 +%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create +%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post +%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%{_datadir}/glusterfs/scripts/get-gfid.sh +%{_datadir}/glusterfs/scripts/slave-upgrade.sh +%{_datadir}/glusterfs/scripts/gsync-upgrade.sh +%{_datadir}/glusterfs/scripts/generate-gfid-file.sh +%{_datadir}/glusterfs/scripts/gsync-sync-gfid %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf %endif @@ -725,6 +742,8 @@ fi %endif %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/glusterfs +# %%dir %{_sharedstatedir}/glusterd/groups +# %%config(noreplace) %{_sharedstatedir}/glusterd/groups/virt # Legacy configs %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd @@ -884,6 +903,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Tue Feb 11 2014 Kaleb S. KEITHLEY - 3.5.0-0.5.beta3 +- GlusterFS 3.5.0 beta3 , glusterfs-3.5.0-0.5beta3 + * Mon Jan 27 2014 Kaleb S. KEITHLEY - 3.5.0-0.4.beta2 - GlusterFS 3.5.0 beta2 , glusterfs-3.5.0-0.4beta2 diff --git a/sources b/sources index 060d2cc..c5095a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc37a547365fb715910c99fefb914216 glusterfs-3.5.0beta2.tar.gz +a47c2282246d069bed22ff40f3928be6 glusterfs-3.5.0beta3.tar.gz