[libvirt] [PATCH] libvirt.spec patch to fix some rpmlint warnings/errors

[Daniel P. Berrange]

On Wed, Feb 11, 2009 at 05:11:00PM +0000, Richard W.M. Jones wrote:
> With this patch we remove some of the easier rpmlint warnings and
> errors.  It is by no means rpmlint clean after applying this patch,
> but the remaining warnings and errors can be ignored.
> 
> FWIW this is for the libvirt merge review:
> https://bugzilla.redhat.com/show_bug.cgi?id=226055
> 
> I'm not sure about the patch to libvirt.init.in, but rpmlint is quite
> insistent that we need this, or else we shouldn't start libvirtd by
> default.

rpmlint is dumb. If we turn it off by default, then we'll just get a 
steady stream of bugs / confused users, who install libvirt RPM (or 
the "Virtualization Group" in installer), reboot and find it is not
working because the daemon wasn't started. This would be a disservice
to our users, which I don't think we should do

> Index: libvirt.spec
> ===================================================================
> RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
> retrieving revision 1.109
> diff -u -r1.109 libvirt.spec
> --- libvirt.spec	6 Feb 2009 19:28:20 -0000	1.109
> +++ libvirt.spec	11 Feb 2009 17:05:01 -0000
> @@ -47,16 +47,16 @@
>  Summary: Library providing a simple API virtualization
>  Name: libvirt
>  Version: 0.6.0
> -Release: 2%{?dist}%{?extra_release}
> +Release: 3%{?dist}%{?extra_release}
>  License: LGPLv2+
>  Group: Development/Libraries
>  Source: libvirt-%{version}.tar.gz
>  Patch1: %{name}-%{version}-timeout.patch
>  Patch2: %{name}-%{version}-rpccall.patch
> +Patch3: %{name}-%{version}-init.patch

NACK to that bit

>  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
>  URL: http://libvirt.org/
>  BuildRequires: python python-devel
> -Requires: libxml2

ACk to that

>  Requires: readline
>  Requires: ncurses
>  Requires: dnsmasq
> @@ -140,7 +140,8 @@
>  BuildRequires: parted-devel
>  # For QEMU/LXC numa info
>  BuildRequires: numactl-devel
> -Obsoletes: libvir
> +Obsoletes: libvir <= 0.2
> +Provides: libvir = %{version}-%{release}

I reckon we can just kill this bit off completely by now. It
was only called 'libvir' for one release before we renamed it.
I think the RPM only ever existed for a few months in Fedora 5
with this old name.

> @@ -157,7 +158,8 @@
>  %if %{with_xen}
>  Requires: xen-devel
>  %endif
> -Obsoletes: libvir-devel
> +Obsoletes: libvir-devel <= 0.2
> +Provides: libvir-devel = %{version}-%{release}
>  
>  %description devel
>  Includes and documentations for the C library providing an API to use
> @@ -168,7 +170,8 @@
>  Summary: Python bindings for the libvirt library
>  Group: Development/Libraries
>  Requires: libvirt = %{version}
> -Obsoletes: libvir-python
> +Obsoletes: libvir-python <= 0.2
> +Provides: libvir-python = %{version}-%{release}

Likewise for these 2 chunks.

> @@ -181,6 +184,10 @@
>  %setup -q
>  %patch1 -p1
>  %patch2 -p1
> +%patch3 -p1
> +
> +mv NEWS NEWS.old
> +iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS

The NEWS file is auto-generated - might be nicer to just change
the XSL file so it generates UTF-8 straight away, instad of the
ISO8859-1.


The other bits look OK.

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|