Re: rdma-core example spec file is broken

[Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>]

On Sun, Nov 06, 2016 at 02:01:20PM +0200, Alaa Hleihel wrote:
> Hi Jason,
> 
> The example spec file is broken after commit ddd530be4622 ("Minor RPM spec file improvments").
> 
> rpmbuild fails with the following error:
> 
> Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.7l0yoN
> + umask 022
> + cd /tmp/xxx/BUILD
> + cd rdma-core-11
> /var/tmp/rpm-tmp.7l0yoN: line 31: syntax error near unexpected token `post'
> error: Bad exit status from /var/tmp/rpm-tmp.7l0yoN (%build)
> 
> The issue is that the new "Requires" macros were added after the %prep and %build sections..

Ah, interesting, in my test scripts the common spec file is
superceeded by the version in redhat/ for systemd systems, which is
why I did not notice it.

Jason

>From f2388d9d110ab43295d50d7345d5dda289a87a41 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Date: Mon, 7 Nov 2016 09:37:38 -0700
Subject: [PATCH] Fix common rdma-core.spec for systemd systems

RPM needs the Requires lines for systemd to be earlier.

Signed-off-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
---
 rdma-core.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/rdma-core.spec b/rdma-core.spec
index 35186c3271b8..bea2a2267d1d 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -46,6 +46,13 @@ BuildRequires: make
 %endif
 %endif
 
+# Detect if systemd is supported on this system
+%if 0%{?_unitdir:1}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%endif
+
 %description
 Temporary packaging
 
@@ -59,9 +66,6 @@ This is a simple example without the split sub packages to get things started.
 # Detect if systemd is supported on this system
 %if 0%{?_unitdir:1}
 %define my_unitdir %{_unitdir}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
 %else
 %define my_unitdir /tmp/
 %endif
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html