[libvirt] [PATCH] spec: Don't mix commands with macro definitions
%build section should first define all required macros and then run commands. Interleaving them makes it harder to spot what commands are run. --- libvirt.spec.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6d6203b..0fdba54 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1333,10 +1333,6 @@ of recent versions of Linux (and other OSes). %define init_scripts --with-init_script=redhat %endif -%if 0%{?enable_autotools} - autoreconf -if -%endif - %if %{with_selinux} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" @@ -1345,6 +1341,11 @@ of recent versions of Linux (and other OSes). %endif %endif + +%if 0%{?enable_autotools} + autoreconf -if +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ -- 1.8.3.2
On 07/30/2013 08:07 AM, Jiri Denemark wrote:
%build section should first define all required macros and then run commands. Interleaving them makes it harder to spot what commands are run. --- libvirt.spec.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
ACK with one observation:
diff --git a/libvirt.spec.in b/libvirt.spec.in index 6d6203b..0fdba54 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1333,10 +1333,6 @@ of recent versions of Linux (and other OSes). %define init_scripts --with-init_script=redhat %endif
-%if 0%{?enable_autotools} - autoreconf -if -%endif - %if %{with_selinux} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" @@ -1345,6 +1341,11 @@ of recent versions of Linux (and other OSes). %endif %endif
Perhaps it deserves a comment here, along the lines of: # place macros above and build commands below this comment
+ +%if 0%{?enable_autotools} + autoreconf -if +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Tue, Jul 30, 2013 at 08:55:53 -0600, Eric Blake wrote:
On 07/30/2013 08:07 AM, Jiri Denemark wrote:
%build section should first define all required macros and then run commands. Interleaving them makes it harder to spot what commands are run. --- libvirt.spec.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
ACK with one observation:
@@ -1345,6 +1341,11 @@ of recent versions of Linux (and other OSes). %endif %endif
Perhaps it deserves a comment here, along the lines of:
# place macros above and build commands below this comment
Done and pushed, thanks. Jirka
participants (2)
-
Eric Blake -
Jiri Denemark