diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-05-31 14:00:35 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-01 06:51:29 -0700 |
| commit | e800c00df1474504032ead25a0bcbbc92c1d6fec (patch) | |
| tree | ca00fdf748a48e6b206993060c99737864123dd5 /glusterfs.spec.in | |
| parent | 24dd33929bbbc9a72360793048f17bf4e6cec8a3 (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.)
Change-Id: Ib3db41cf0b7334a41b5174bba0c57e9aeb13407c
BUG: 1341294
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14590
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.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 ed5b0623a9f..82c0ab79157 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1142,6 +1142,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 @@ -1192,6 +1196,10 @@ exit 0 %{_sbindir}/gf_recon %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/... (#1326410) |