8:53 a.m.
2 patches from a Fedora contributor, 1 from me, dropping spec bits
that aren't required on el6 and later builds
Cole Robinson (1):
spec: Remove Group: tags
Igor Gnatenko (2):
spec: Remove BuildRoot definition
spec: Remove %clean section
libvirt.spec.in | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
--
2.17.0
8:53 a.m.
New subject: [libvirt] [PATCH 1/3] spec: Remove BuildRoot definition
From: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
None of currently supported distributions need that.
It was needed last for EL5 which is EOL now
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
libvirt.spec.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index e261e259a4..b629e18e8d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -255,7 +255,6 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: https://libvirt.org/
%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1
--
2.17.0
8:53 a.m.
New subject: [libvirt] [PATCH 2/3] spec: Remove %clean section
From: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
libvirt.spec.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index b629e18e8d..81f99e5c0a 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1457,9 +1457,6 @@ mv
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
%endif
-%clean
-rm -fr %{buildroot}
-
%check
cd tests
# These tests don't current work in a mock build root
--
2.17.0
8:53 a.m.
New subject: [libvirt] [PATCH 3/3] spec: Remove Group: tags
It's only required on el5 which we don't support anymore. Everywhere
else it's not used for anything useful
https://fedoraproject.org/wiki/RPMGroups
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
libvirt.spec.in | 41 -----------------------------------------
1 file changed, 41 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 81f99e5c0a..9ea5e6b32a 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -254,7 +254,6 @@ Name: libvirt
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
-Group: Development/Libraries
URL: https://libvirt.org/
%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1
@@ -467,7 +466,6 @@ the libvirtd server exporting the virtualization support.
%package docs
Summary: API reference and website documentation
-Group: Development/Libraries
%description docs
Includes the API reference for the libvirt C library, and a complete
@@ -475,7 +473,6 @@ copy of the libvirt.org website documentation.
%package daemon
Summary: Server side daemon and supporting files for libvirt library
-Group: Development/Libraries
# All runtime requirements for the libvirt package (runtime requrements
# for subpackages are listed later in those subpackages)
@@ -522,7 +519,6 @@ for specific drivers.
%package daemon-config-network
Summary: Default configuration files for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -532,7 +528,6 @@ Default configuration files for setting up NAT based networking
%package daemon-config-nwfilter
Summary: Network filter configuration files for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@@ -542,7 +537,6 @@ Network filter configuration files for cleaning guest traffic
%package daemon-driver-network
Summary: Network driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: dnsmasq >= 2.41
Requires: radvd
@@ -559,7 +553,6 @@ bridge capabilities.
%package daemon-driver-nwfilter
Summary: Nwfilter driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: iptables
%if 0%{?rhel} && 0%{?rhel} < 7
@@ -575,7 +568,6 @@ iptables and ip6tables capabilities
%package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
# needed for device enumeration
%if 0%{?fedora} || 0%{?rhel} >= 7
@@ -592,7 +584,6 @@ capabilities.
%package daemon-driver-interface
Summary: Interface driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
%if (0%{?fedora} || 0%{?rhel} >= 7)
Requires: netcf-libs >= 0.2.2
@@ -606,7 +597,6 @@ netcf library
%package daemon-driver-secret
Summary: Secret driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
%description daemon-driver-secret
@@ -615,7 +605,6 @@ 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
Requires: libvirt-daemon = %{version}-%{release}
Requires: nfs-utils
# For mkfs
@@ -632,7 +621,6 @@ iSCSI, and multipath storage.
%package daemon-driver-storage-logical
Summary: Storage driver plugin for lvm volumes
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: lvm2
@@ -643,7 +631,6 @@ volumes using lvm.
%package daemon-driver-storage-disk
Summary: Storage driver plugin for disk
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: parted
Requires: device-mapper
@@ -655,7 +642,6 @@ volumes using the host disks.
%package daemon-driver-storage-scsi
Summary: Storage driver plugin for local scsi devices
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-scsi
@@ -665,7 +651,6 @@ host devices.
%package daemon-driver-storage-iscsi
Summary: Storage driver plugin for iscsi
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: iscsi-initiator-utils
@@ -676,7 +661,6 @@ volumes using the host iscsi stack.
%package daemon-driver-storage-mpath
Summary: Storage driver plugin for multipath volumes
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: device-mapper
@@ -688,7 +672,6 @@ multipath storage using device mapper.
%if %{with_storage_gluster}
%package daemon-driver-storage-gluster
Summary: Storage driver plugin for gluster
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
%if 0%{?fedora}
Requires: glusterfs-client >= 2.0.1
@@ -706,7 +689,6 @@ volumes using libgfapi.
%if %{with_storage_rbd}
%package daemon-driver-storage-rbd
Summary: Storage driver plugin for rbd
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
%description daemon-driver-storage-rbd
@@ -718,7 +700,6 @@ volumes using the ceph protocol.
%if %{with_storage_sheepdog}
%package daemon-driver-storage-sheepdog
Summary: Storage driver plugin for sheepdog
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: sheepdog
@@ -731,7 +712,6 @@ sheepdog volumes using.
%if %{with_storage_zfs}
%package daemon-driver-storage-zfs
Summary: Storage driver plugin for ZFS
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
# Support any conforming implementation of zfs
Requires: /sbin/zfs
@@ -745,7 +725,6 @@ ZFS volumes.
%package daemon-driver-storage
Summary: Storage driver plugin including all backends for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
@@ -774,7 +753,6 @@ parted and more.
%if %{with_qemu}
%package daemon-driver-qemu
Summary: QEMU driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
# There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -799,7 +777,6 @@ QEMU
%if %{with_lxc}
%package daemon-driver-lxc
Summary: LXC driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
# There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -817,7 +794,6 @@ the Linux kernel
%if %{with_uml}
%package daemon-driver-uml
Summary: Uml driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
%description daemon-driver-uml
@@ -830,7 +806,6 @@ User Mode Linux
%if %{with_vbox}
%package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
%description daemon-driver-vbox
@@ -843,7 +818,6 @@ VirtualBox
%if %{with_libxl}
%package daemon-driver-libxl
Summary: Libxl driver plugin for the libvirtd daemon
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Obsoletes: libvirt-daemon-driver-xen < 4.3.0
@@ -858,7 +832,6 @@ Libxl
%if %{with_qemu_tcg}
%package daemon-qemu
Summary: Server side daemon & driver required to run QEMU guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
@@ -879,7 +852,6 @@ capabilities of the QEMU TCG emulators
%if %{with_qemu_kvm}
%package daemon-kvm
Summary: Server side daemon & driver required to run KVM guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
@@ -900,7 +872,6 @@ capabilities of the KVM hypervisor
%if %{with_lxc}
%package daemon-lxc
Summary: Server side daemon & driver required to run LXC guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
@@ -920,7 +891,6 @@ capabilities of LXC
%if %{with_uml}
%package daemon-uml
Summary: Server side daemon & driver required to run UML guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-uml = %{version}-%{release}
@@ -941,7 +911,6 @@ capabilities of UML
%if %{with_libxl}
%package daemon-xen
Summary: Server side daemon & driver required to run XEN guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_libxl}
@@ -963,7 +932,6 @@ capabilities of XEN
%if %{with_vbox}
%package daemon-vbox
Summary: Server side daemon & driver required to run VirtualBox guests
-Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
@@ -981,7 +949,6 @@ capabilities of VirtualBox
%package client
Summary: Client side utilities of the libvirt library
-Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: readline
Requires: ncurses
@@ -1003,7 +970,6 @@ capabilities of recent versions of Linux (and other OSes).
%package libs
Summary: Client side libraries
-Group: Development/Libraries
# So remote clients can access libvirt over SSH tunnel
# (client invokes 'nc' against the UNIX socket on the server)
Requires: nc
@@ -1017,7 +983,6 @@ Shared libraries for accessing the libvirt daemon.
%package admin
Summary: Set of tools to control libvirt daemon
-Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: readline
%if %{with_bash_completion}
@@ -1030,7 +995,6 @@ The client side utilities to control the libvirt daemon.
%if %{with_bash_completion}
%package bash-completion
Summary: Bash completion script
-Group: Development/Libraries
%description bash-completion
Bash completion script stub.
@@ -1039,7 +1003,6 @@ Bash completion script stub.
%if %{with_wireshark}
%package wireshark
Summary: Wireshark dissector plugin for libvirt RPC transactions
-Group: Development/Libraries
Requires: wireshark >= 1.12.6-4
Requires: %{name}-libs = %{version}-%{release}
@@ -1050,7 +1013,6 @@ Wireshark dissector plugin for better analysis of libvirt RPC
traffic.
%if %{with_lxc}
%package login-shell
Summary: Login shell for connecting users to an LXC container
-Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description login-shell
@@ -1061,7 +1023,6 @@ namespaces.
%package devel
Summary: Libraries, includes, etc. to compile with the libvirt library
-Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
@@ -1071,7 +1032,6 @@ 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
Requires: sanlock >= 2.4
#for virt-sanlock-cleanup require augeas
Requires: augeas
@@ -1085,7 +1045,6 @@ driver
%package nss
Summary: Libvirt plugin for Name Service Switch
-Group: Development/Libraries
Requires: libvirt-daemon-driver-network = %{version}-%{release}
%description nss
--
2.17.0
8:58 a.m.
On Tue, May 08, 2018 at 09:53:22AM -0400, Cole Robinson wrote:
2 patches from a Fedora contributor, 1 from me, dropping spec bits
that aren't required on el6 and later builds
Cole Robinson (1):
spec: Remove Group: tags
Igor Gnatenko (2):
spec: Remove BuildRoot definition
spec: Remove %clean section
libvirt.spec.in | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
For all threee
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:01 a.m.
On Tue, 2018-05-08 at 09:53 -0400, Cole Robinson wrote:
2 patches from a Fedora contributor, 1 from me, dropping spec bits
that aren't required on el6 and later builds
Note that we no longer support building on CentOS 6 either, so
maybe there are more cleanup opportunities there...
--
Andrea Bolognani / Red Hat / Virtualization
8:22 a.m.
On 05/09/2018 05:01 AM, Andrea Bolognani wrote:
On Tue, 2018-05-08 at 09:53 -0400, Cole Robinson wrote:
> 2 patches from a Fedora contributor, 1 from me, dropping spec bits
> that aren't required on el6 and later builds
Note that we no longer support building on CentOS 6 either, so
maybe there are more cleanup opportunities there...
On a quick glance I don't see any of this type of RPM boiler plate that
can be dropped, much of that was tied to RHEL5 compat. But there's
definitely a lot of 0%{?rhel} >= 7 conditionals which are redundant now,
which leads to dropping non-systemd and non-systemd-macros stuff which
is quite nice
- Cole
2392
days inactive
2393
days old
6 comments
3 participants
participants (3)
-
Andrea Bolognani -
Cole Robinson -
Daniel P. Berrangé