diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-05-31 14:11:47 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-06-02 16:33:16 -0700 |
| commit | 2e67cfe155d186455e46f2e5b9fd0eefad2a35b6 (patch) | |
| tree | 949a824ea3de274bbe24ee225a6e1d42b1052029 /glusterfs.spec.in | |
| parent | a8d86daf45d4999b885c799307df4ab1abfd25f4 (diff) | |
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 <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14591
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 8 |
1 files changed, 8 insertions, 0 deletions
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 <kkeithle@redhat.com> +- broken brp-python-bytecompile in RHEL7 results in installed + but unpackaged files. + * Fri May 6 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com> - additional dirs and files in /var/lib/glusterd/... (#1333900) |