summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-12-12 14:12:35 +0100
committerNiels de Vos <ndevos@redhat.com>2014-12-15 04:52:02 -0800
commit358576530c5503f251bc7f4c53cb04064a78aee6 (patch)
treeca28bf84ce8365d662492f6820b68fa8aa279133
parent46f7fd66f7d77b3753c98e9e7c27ba6a5280db40 (diff)
build: prevent double packaging of geo-replication and other scripts
The regression-tests sub-package contains /usr/share/glusterfs/* instead of including only the needed files. This causes some of the scripts that are part of geo-replication to be packaged twice. BUG: 1169005 Change-Id: Ib452e73f3c1775b252ab257aab852ad9af857e74 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9272 Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--glusterfs.spec.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index eb2bff253e7..876db1b635e 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -849,6 +849,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
@@ -937,7 +938,8 @@ fi
%endif
%files regression-tests
-%{_prefix}/share/glusterfs/*
+%{_prefix}/share/glusterfs/run-tests.sh
+%{_prefix}/share/glusterfs/tests
%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t
%if ( 0%{!?_without_ocf:1} )
@@ -1018,6 +1020,9 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
+* Fri Dec 12 2014 Niels de Vos <ndevos@redhat.com>
+- do not package all /usr/share/glusterfs/* files in regression-tests (#1169005)
+
* Fri Sep 26 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- smarter logic in %%post server (#1146426)