From a34c2f113aebf663553d0b68ee35021c0d797304 Mon Sep 17 00:00:00 2001 From: Lalatendu Mohanty Date: Fri, 19 Dec 2014 20:03:12 +0530 Subject: [PATCH] GlusterFS 3.6.2beta1 and Fixing #1169005 (upstream) Signed-off-by: Lalatendu Mohanty --- glusterfs.spec | 41 ++++++++++++----------------------------- sources | 2 +- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index f15c137..90e129c 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 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 3.6.2beta1 +- GlusterFS 3.6.2beta1 + +* Fri Dec 12 2014 Niels de Vos +- do not package all /usr/share/glusterfs/* files in regression-tests (#1169005) + * Sat Nov 29 2014 Lalatendu Mohanty 3.6.1-4 - Fix build on el5 (upstream bug 1169004) diff --git a/sources b/sources index cd6b88b..1498541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffc1c280fa4652124100a9b1c9ad5bb9 glusterfs-3.6.1.tar.gz +1b8027733586c646a060a096c82b9b4e glusterfs-3.6.2beta1.tar.gz