rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

GlusterFS 3.6.2beta1 and Fixing #1169005 (upstream)

Browse Source 
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
This commit is contained in:
Lalatendu Mohanty 2014-12-19 20:03:12 +05:30
parent 48d9d9a5dd
commit a34c2f113a
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
glusterfs.spec
View File

@ -3,7 +3,7 @@
%global _for_fedora_koji_builds 1
# uncomment and add '%' to use the prereltag for pre-releases
#%%global prereltag beta3
%global prereltag beta1
##-----------------------------------------------------------------------------
## All argument definitions should be placed here and keep them sorted
@ -145,8 +145,8 @@
Summary: Cluster File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 3.6.1
Release: 4%{?prereltag:.%{prereltag}}%{?dist}
Version: 3.6.2
Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
Vendor: Fedora Project
%else
Name: @PACKAGE_NAME@
@ -720,26 +720,6 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
install -p -m 0744 -D extras/command-completion/gluster.bash \
%{buildroot}%{_sysconfdir}/bash_completion.d/gluster
%if ( 0%{?_without_georeplication:1} )
rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/get-gfid.sh
rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/slave-upgrade.sh
rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/gsync-upgrade.sh
rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/generate-gfid-file.sh
rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/gsync-sync-gfid
%endif
## While introducing symbol versioning in libgfapi.so, the pkg-config version
## for gluster-api got reset to 0. This is causing users of pkg-config to be
## confused, they can not reliably check the version anymore. In upstream
## Gluster we have changed the version in gluster-api to 4.3.6.x so that
## existing checks for ">= 4" are still valid.
##
## Upstream bug 1166232, should get fixed in 3.6.2 and then this note + sed
## patching can get dropped from this .spec.
sed -i 's/^Version: 0.0.0/Version: 4.%{version}/' \
%{buildroot}%{_libdir}/pkgconfig/glusterfs-api.pc
%clean
rm -rf %{buildroot}
@ -893,6 +873,7 @@ fi
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache*
%dir %{_datadir}/glusterfs/scripts
%{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
%{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
@ -982,13 +963,9 @@ fi
%if ( ! 0%{_for_fedora_koji_builds} )
%files regression-tests
%{_prefix}/share/glusterfs/*
%{_prefix}/share/glusterfs/run-tests.sh
%{_prefix}/share/glusterfs/tests
%exclude %{_datadir}/glusterfs/tests/basic/rpm.t
%exclude %{_datadir}/glusterfs/scripts/generate-gfid-file.sh
%exclude %{_datadir}/glusterfs/scripts/get-gfid.sh
%exclude %{_datadir}/glusterfs/scripts/gsync-sync-gfid
%exclude %{_datadir}/glusterfs/scripts/gsync-upgrade.sh
%exclude %{_datadir}/glusterfs/scripts/slave-upgrade.sh
%endif
%if ( 0%{!?_without_ocf:1} )
@ -1072,6 +1049,12 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
* Fri Dec 19 2014 Lalatendu Mohanty <lmohanty@redhat.com> 3.6.2beta1
- GlusterFS 3.6.2beta1
* Fri Dec 12 2014 Niels de Vos <ndevos@redhat.com>
- do not package all /usr/share/glusterfs/* files in regression-tests (#1169005)
* Sat Nov 29 2014 Lalatendu Mohanty <lmohanty@redhat.com> 3.6.1-4
- Fix build on el5 (upstream bug 1169004)

2
sources
View File

@ -1 +1 @@
ffc1c280fa4652124100a9b1c9ad5bb9 glusterfs-3.6.1.tar.gz
1b8027733586c646a060a096c82b9b4e glusterfs-3.6.2beta1.tar.gz