From 2e67cfe155d186455e46f2e5b9fd0eefad2a35b6 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Tue, 31 May 2016 14:11:47 -0400 Subject: build: RHEL7 unpackaged files .../hooks/S57glusterfind-delete-post.{pyc,pyo} building on Real RHEL7 (versus mock?) results in installed (but unpackaged) files found: /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyc /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyo The same .spec file on Fedora 23 and RHEL6 does not encounter this issue. (Replacing the RHEL7 /usr/lib/rpm/brp-python-bytecompile file with the one from Fedora 23 also makes the problem go away. But we are probably not going to get a fixed rpm/rpmbuild soon enough to make this go away by itself.) backport of mainline: > BUG: 1341294 > http://review.gluster.org/14590 Change-Id: Ib3db41cf0b7334a41b5174bba0c57e9aeb13407c BUG: 1341295 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/14591 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- glusterfs.spec.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 39b6cb01c71..06703d917f7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1137,6 +1137,10 @@ exit 0 %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py +%if ( 0%{?rhel} && 0%{?rhel} > 6 ) +%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyc +%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyo +%endif %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post @@ -1184,6 +1188,10 @@ exit 0 %endif %changelog +* Tue May 31 2016 Kaleb S. KEITHLEY +- broken brp-python-bytecompile in RHEL7 results in installed + but unpackaged files. + * Fri May 6 2016 Kaleb S. KEITHLEY - additional dirs and files in /var/lib/glusterd/... (#1333900) -- cgit