Bug 1392354
| Summary: | %_pkgdocdir macro not versioned | ||
|---|---|---|---|
| Product: | Red Hat Enterprise Linux 7 | Reporter: | Mattias Ellert <mattias.ellert> |
| Component: | redhat-rpm-config | Assignee: | Florian Festi <ffesti> |
| Status: | CLOSED ERRATA | QA Contact: | Jan Blazek <jblazek> |
| Severity: | urgent | Docs Contact: | |
| Priority: | high | ||
| Version: | 7.4 | CC: | carl, ffesti, gbailey, kdreyer, ksrot, orion, petersen, pmatilai, tis, vmukhame, walters |
| Target Milestone: | rc | ||
| Target Release: | --- | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Fixed In Version: | redhat-rpm-config-9.1.0-75.el7.src.rpm | Doc Type: | If docs needed, set a value |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2017-08-01 19:34:30 UTC | Type: | Bug |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
| Embargoed: | |||
| Bug Depends On: | |||
| Bug Blocks: | 1393866 | ||
|
Description
Mattias Ellert
2016-11-07 10:00:44 UTC
This is messy. I'm seeing several EPEL packages (babeltrace, lttng-ust, others) now fail to build from source with a RHEL 7.3 buildroot. Is there a suggested workaround with macros magic? Or should I wait for this to be resolved and then resubmit a build to koji? Looks like it was introduced via: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=1057327 I've submitted an update and buildroot override to fix this for EPEL7 - https://bodhi.fedoraproject.org/updates/epel-rpm-macros-7-11 Please test. (In reply to Orion Poplawski from comment #9) > I've submitted an update and buildroot override to fix this for EPEL7 - > https://bodhi.fedoraproject.org/updates/epel-rpm-macros-7-11 > > Please test. Unfortunately it does not work: [ellert@localhost ~]$ rpm -q redhat-rpm-config epel-rpm-macros redhat-rpm-config-9.1.0-72.el7.centos.noarch epel-rpm-macros-7-11.noarch [ellert@localhost ~]$ rpm -E %_pkgdocdir %{_docdir}/%{name} If I rename macros-zzz-epel-override to macros.zzz-epel-override it works though: [ellert@localhost ~]$ su - Lösenord: Senaste inloggning: fre 9 dec 2016 13.14.22 CET på pts/0 [root@localhost ~]# mv /etc/rpm/macros-zzz-epel-override /etc/rpm/macros.zzz-epel-override [root@localhost ~]# exit utloggning [ellert@localhost ~]$ rpm -E %_pkgdocdir %{_docdir}/%{name}-%{version} Thanks for catching that. New update submitted. Any update on this? My koji build on EPEL7 is still failing and I'm unable to push out an update... I've resubmitted a buildroot override for epel-rpm-macros-7-12. Can you try now? (In reply to Orion Poplawski from comment #13) > I've resubmitted a buildroot override for epel-rpm-macros-7-12. Can you try > now? Yes, it builds successfully now. Thanks! Fixed in redhat-rpm-config-9.1.0-75.el7.src.rpm Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHBA-2017:2161 This didn't make it into the 7.4 buildroots apparently. But you will get the new redhat-rpm-config if you e.g. set up a development container/VM using the latest from the repos. Hence, packages will really need to build both with and without this change. I ended up with this workaround: From ecdda81c9b915ecbdea9438a0fa7a92d8f5bef46 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters> Date: Mon, 31 Jul 2017 20:45:52 -0400 Subject: [PATCH] Tweak build to work both with and without BZ#1392354 I was trying to fix something else and ran into this. --- flatpak.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/flatpak.spec b/flatpak.spec index 6cb50cc..f83648c 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -2,7 +2,7 @@ Name: flatpak Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application deployment framework for desktop apps Group: Development/Tools @@ -142,7 +142,13 @@ sed -i s/ostree-1// %{name}.pc %install %make_install install root/lib/libostree-flatpak-1.so.1.0.0 %{buildroot}%{_libdir} -install -pm 644 NEWS README.md %{buildroot}/%{_pkgdocdir} +# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1392354 +install -d %{buildroot}/%{_pkgdocdir} +if test -d %{buildroot}/%{_docdir}/%{name}; then + mv %{buildroot}/%{_docdir}/%{name}/* %{buildroot}/%{_pkgdocdir} + rmdir %{buildroot}/%{_docdir}/%{name}/ +fi +install -t %{buildroot}/%{_pkgdocdir} -pm 644 NEWS README.md # The system repo is not installed by the flatpak build system. install -d %{buildroot}%{_localstatedir}/lib/flatpak install -d %{buildroot}%{_sysconfdir}/flatpak/remotes.d @@ -218,6 +224,9 @@ flatpak remote-list --system &> /dev/null || : %changelog +* Tue Aug 01 2017 Colin Walters <walters> - 0.8.7-2 +- Tweak build to work both with and without BZ#1392354 + * Tue Jun 20 2017 Kalev Lember <klember> - 0.8.7-1 - Update to 0.8.7 - Resolves: #1391018 -- 2.13.3 Clear needinfo |