Accepting request 637734 from home:jengelh:branches:Virtualization

- Fix RPM groups. Remove idempotent %if..%endif guards.
- Remove redundant %clean section.

OBS-URL: https://build.opensuse.org/request/show/637734
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=707

libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 24 10:42:27 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Fix RPM groups. Remove idempotent %if..%endif guards.
+- Remove redundant %clean section.
+
 -------------------------------------------------------------------
 Wed Sep 19 22:01:11 UTC 2018 - James Fehlig <jfehlig@suse.com>
 

libvirt.spec

@@ -187,7 +187,7 @@ Name:           libvirt
 Url:            http://libvirt.org/
 Version:        4.7.0
 Release:        0
-Summary:        Library providing a simple virtualization API
+Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 
@@ -392,6 +392,7 @@ to interact with Linux virtualization technologies.
 %package doc
 Summary:        API reference and website documentation for libvirt
 Group:          Documentation/HTML
+BuildArch:      noarch
 
 %description doc
 Includes the API reference for the libvirt C library, and a complete
@@ -399,7 +400,7 @@ copy of the libvirt.org website documentation.
 
 %package daemon
 Summary:        Server side daemon and supporting files for libvirt
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 
 # All runtime requirements for the libvirt package (runtime requirements
 # for subpackages are listed later in those subpackages)
@@ -413,7 +414,7 @@ Requires:       iproute
 Requires:       logrotate
 Requires:       udev >= 145
 Recommends:     polkit >= 0.112
-%ifarch i386 i586 i686 x86_64 ia64
+%ifarch %ix86 x86_64 ia64
 # For virConnectGetSysinfo
 Requires:       dmidecode
 %endif
@@ -439,8 +440,7 @@ for specific drivers.
 
 %package daemon-hooks
 Summary:        Hook scripts for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       python3-lxml
 
@@ -449,8 +449,7 @@ Default hook scripts for the libvirt daemon
 
 %package daemon-config-network
 Summary:        Default configuration files for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 
@@ -459,8 +458,7 @@ Default configuration files for setting up NAT based networking
 
 %package daemon-config-nwfilter
 Summary:        Network filter configuration files for the libvirtd
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
 
@@ -470,7 +468,7 @@ cleaning guest network traffic.
 
 %package daemon-driver-network
 Summary:        Network driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       dnsmasq >= 2.41
@@ -484,7 +482,7 @@ bridge capabilities.
 
 %package daemon-driver-nwfilter
 Summary:        A nwfilter driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       ebtables
@@ -497,7 +495,7 @@ iptables and ip6tables capabilities
 
 %package daemon-driver-nodedev
 Summary:        Nodedev driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -508,7 +506,7 @@ capabilities.
 
 %package daemon-driver-interface
 Summary:        Interface driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -519,7 +517,7 @@ netcontrol library
 
 %package daemon-driver-secret
 Summary:        Secret driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 
 %description daemon-driver-secret
@@ -528,7 +526,7 @@ an implementation of the secret key APIs.
 
 %package daemon-driver-storage-core
 Summary:        Storage driver plugin including base backends for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       nfs-utils
@@ -546,7 +544,7 @@ iSCSI, and multipath storage.
 
 %package daemon-driver-storage-logical
 Summary:        Storage driver plugin for lvm volumes
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       lvm2
@@ -557,7 +555,7 @@ volumes using lvm.
 
 %package daemon-driver-storage-disk
 Summary:        Storage driver plugin for disk
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       device-mapper
 Requires:       parted
@@ -568,7 +566,7 @@ volumes using the host disks.
 
 %package daemon-driver-storage-scsi
 Summary:        Storage driver plugin for local scsi devices
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -578,7 +576,7 @@ host devices.
 
 %package daemon-driver-storage-iscsi
 Summary:        Storage driver plugin for iscsi
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       open-iscsi
@@ -587,21 +585,19 @@ Requires:       open-iscsi
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using the host iscsi stack.
 
-%if %{with_storage_iscsi_direct}
 %package daemon-driver-storage-iscsi-direct
 Summary:        Storage driver plugin for iscsi-direct
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description daemon-driver-storage-iscsi-direct
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using libiscsi direct connection.
-%endif
 
 %package daemon-driver-storage-mpath
 Summary:        Storage driver plugin for multipath volumes
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       device-mapper
@@ -610,35 +606,29 @@ Requires:       device-mapper
 The storage driver backend adding implementation of the storage APIs for
 multipath storage using device mapper.
 
-
-%if %{with_storage_gluster}
 %package daemon-driver-storage-gluster
 Summary:        Storage driver plugin for gluster
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description daemon-driver-storage-gluster
 The storage driver backend adding implementation of the storage APIs for gluster
 volumes using libgfapi.
-%endif
 
-%if %{with_storage_rbd}
 %package daemon-driver-storage-rbd
 Summary:        Storage driver plugin for rbd
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description daemon-driver-storage-rbd
 The storage driver backend adding implementation of the storage APIs for rbd
 volumes using the ceph protocol.
-%endif
 
-%if %{with_storage_sheepdog}
 %package daemon-driver-storage-sheepdog
 Summary:        Storage driver plugin for sheepdog
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       sheepdog
@@ -646,11 +636,10 @@ Requires:       sheepdog
 %description daemon-driver-storage-sheepdog
 The storage driver backend adding implementation of the storage APIs for
 sheepdog volumes using.
-%endif
 
 %package daemon-driver-storage
 Summary:        Storage driver plugin including all backends for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage-disk = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage-iscsi = %{version}-%{release}
@@ -675,11 +664,9 @@ The storage driver plugin for the libvirtd daemon, providing
 an implementation of the storage APIs using LVM, iSCSI,
 parted and more.
 
-%if %{with_qemu}
-
 %package daemon-driver-qemu
 Summary:        Qemu driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
@@ -696,13 +683,10 @@ Requires:       xz
 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using QEMU.
-%endif
-
-%if %{with_lxc}
 
 %package daemon-driver-lxc
 Summary:        LXC driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
@@ -712,13 +696,10 @@ Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 The LXC driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 the Linux kernel
-%endif
-
-%if %{with_uml}
 
 %package daemon-driver-uml
-Summary:        Uml driver plugin for the libvirtd daemon
+Summary:        User Mode Linux driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -726,13 +707,10 @@ Requires:       %{name}-libs = %{version}-%{release}
 The UML driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 User Mode Linux
-%endif
-
-%if %{with_vbox}
 
 %package daemon-driver-vbox
 Summary:        VirtualBox driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
@@ -740,27 +718,20 @@ Requires:       %{name}-libs = %{version}-%{release}
 The vbox driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 VirtualBox
-%endif
-
-%if %{with_libxl}
 
 %package daemon-driver-libxl
 Summary:        Libxl driver plugin for the libvirtd daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description daemon-driver-libxl
 The Libxl driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using libxl.
-%endif
-
-%if %{with_qemu}
 
 %package daemon-qemu
 Summary:        Server side daemon & driver required to run QEMU guests
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
@@ -773,14 +744,10 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 %description daemon-qemu
 Server side daemon and driver required to manage the virtualization
 capabilities of the QEMU emulators
-%endif
-
-%if %{with_lxc}
 
 %package daemon-lxc
 Summary:        Server side daemon & driver required to run LXC guests
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-lxc = %{version}-%{release}
@@ -793,14 +760,10 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 %description daemon-lxc
 Server side daemon and driver required to manage the virtualization
 capabilities of LXC
-%endif
-
-%if %{with_uml}
 
 %package daemon-uml
 Summary:        Server side daemon & driver required to run UML guests
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
@@ -813,14 +776,10 @@ Requires:       %{name}-daemon-driver-uml = %{version}-%{release}
 %description daemon-uml
 Server side daemon and driver required to manage the virtualization
 capabilities of UML
-%endif
-
-%if %{with_libxl}
 
 %package daemon-xen
 Summary:        Server side daemon & driver required to run XEN guests
-Group:          Development/Libraries/C and C++
+Group:          System/Management
-
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-libxl = %{version}-%{release}
@@ -834,13 +793,10 @@ Requires:       xen
 %description daemon-xen
 Server side daemon and driver required to manage the virtualization
 capabilities of XEN
-%endif
-
-%if %{with_vbox}
 
 %package daemon-vbox
 Summary:        Server side daemon & driver required to run VirtualBox guests
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
@@ -856,11 +812,10 @@ Requires:       virtualbox < 5.3
 %description daemon-vbox
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
-%endif
 
 %package client
 Summary:        Client side utilities of the libvirt library
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       ncurses
 Requires:       readline
@@ -881,7 +836,7 @@ capabilities of recent versions of Linux (and other OSes).
 Summary:        Client side libraries for libvirt
 # So remote clients can access libvirt over SSH tunnel
 # (client invokes 'nc' against the UNIX socket on the server)
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 Requires:       netcat-openbsd
 # Not technically required, but makes 'out-of-box' config
 # work correctly & doesn't have onerous dependencies
@@ -892,7 +847,7 @@ Shared libraries for accessing the libvirt daemon.
 
 %package admin
 Summary:        Set of tools to control libvirt daemon
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       readline
 %if %{with_bash_completion}
@@ -902,14 +857,13 @@ Requires:       %{name}-bash-completion = %{version}-%{release}
 %description admin
 The client side utilities to control the libvirt daemon.
 
-%if %{with_bash_completion}
 %package bash-completion
 Summary:        Bash completion script
-Group:          Development/Libraries/C and C++
+Group:          System/Shells
+BuildArch:      noarch
 
 %description bash-completion
 Bash completion script stub.
-%endif
 
 %package devel
 Summary:        Libraries, includes, etc. to compile with the libvirt library
@@ -921,12 +875,9 @@ Requires:       pkg-config
 %description devel
 Include header files & development libraries for the libvirt C library.
 
-
-%if %{with_sanlock}
-
 %package lock-sanlock
 Summary:        Sanlock lock manager plugin for QEMU driver
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       sanlock >= 2.4
 # for virt-sanlock-cleanup require augeas
 Requires:       %{name}-daemon = %{version}-%{release}
@@ -935,9 +886,6 @@ Requires:       augeas
 
 %description lock-sanlock
 Includes the Sanlock lock manager plugin for the QEMU driver
-%endif
-
-%if %{with_wireshark}
 
 %package -n wireshark-plugin-libvirt
 Summary:        Wireshark plugin for libvirt RPC protocol
@@ -947,11 +895,10 @@ Requires:       wireshark
 
 %description -n wireshark-plugin-libvirt
 Wireshark dissector plugin for better analysis of libvirt RPC traffic.
-%endif
 
 %package nss
 Summary:        Libvirt plugin for Name Service Switch
-Group:          Development/Libraries/C and C++
+Group:          System/Management
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 
 %description nss
@@ -1320,9 +1267,6 @@ mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %endif
 %fdupes -s %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %check
 cd tests
 SKIP_TESTS=""