[libvirt] [PATCH 2/2] spec: indent %if to make it easier to see conditions

Jiri Denemark jdenemar at redhat.com
Thu Jan 10 09:13:36 UTC 2013


On Wed, Jan 09, 2013 at 16:45:12 -0700, Eric Blake wrote:
> * libvirt.spec.in: Add some indentation to make it easier to follow
> various conditionals.
> ---
>  libvirt.spec.in | 858 ++++++++++++++++++++++++++++----------------------------
>  1 file changed, 428 insertions(+), 430 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 2eba7c7..a567870 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -22,16 +22,16 @@
> 
>  # RHEL-5 builds are client-only for s390, ppc
>  %if 0%{?rhel} == 5
> -%ifnarch %{ix86} x86_64 ia64
> -%define client_only        1
> -%endif
> + %ifnarch %{ix86} x86_64 ia64
> +  %define client_only        1
> + %endif
>  %endif

I like the idea but I'm a bit concerned about compatibility with various
RPM versions. Is this documented as being supported somewhere?

> @@ -2505,7 +2503,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
>  - need rebuild since libxenstore is now versionned
> 
>  * Mon Jul 24 2006 Mark McLoughlin <markmc at redhat.com> - 0.1.3-2
> -- Add BuildRequires: xen-devel
> +- AddBuildRequires: xen-devel
> 
>  * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.3-1.1
>  - rebuild

However, you certainly didn't want to do this last change :-)

Jirka




More information about the libvir-list mailing list