summaryrefslogtreecommitdiffstats
path: root/glusterfs.spec.in
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
committerJeff Darcy <jdarcy@redhat.com>2014-04-28 14:18:50 +0000
commite139b4d0ba2286c0d4d44ba81260c2b287016019 (patch)
tree0a21f0761528e0f79da0a9f67106eb128ace0cf7 /glusterfs.spec.in
parent73b60c87ca7f62517a8466431f5a8cf167589c8c (diff)
parentf2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff)
Merge branch 'upstream'HEADmaster
Conflicts: rpc/xdr/src/glusterfs3-xdr.c rpc/xdr/src/glusterfs3-xdr.h xlators/features/changelog/src/Makefile.am xlators/features/changelog/src/changelog-helpers.h xlators/features/changelog/src/changelog.c xlators/mgmt/glusterd/src/glusterd-sm.c Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r--glusterfs.spec.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index fc91babd4..79804f538 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -574,6 +574,9 @@ EOM
rm -rf %{buildroot}/benchmarking
rm -f %{buildroot}/glusterfs-mode.el
rm -f %{buildroot}/glusterfs.vim
+rm -fr %{buildroot}/%{_docdir}/glusterfs/benchmarking
+rm -f %{buildroot}/%{_docdir}/glusterfs/glusterfs-mode.el
+rm -f %{buildroot}/%{_docdir}/glusterfs/glusterfs.vim
# Create working directory
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd
@@ -989,6 +992,9 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
+* Fri Apr 25 2014 Arumugam Balamurugan <barumuga@redhat.com>
+- fix RHEL 7 build failure "Installed (but unpackaged) file(s) found" (#1058188)
+
* Wed Apr 02 2014 Arumugam Balamurugan <barumuga@redhat.com>
- cleanup to rearrange spec file elements