libvirt clean header settings

Signed-off-by: virtbuilder_pel7ppc64bebuilder0 <virtbuilder@powerel.org>

SPECS/libvirt.spec

@@ -35,7 +35,6 @@
 %define with_libssh           1
 %define with_libssh2          1
 %define with_bash_completion  1
-%define with_cgconfig         1
 %define with_wireshark        0
 %define wireshark_plugindir   %{_libdir}/wireshark/plugins
 %define python                python2
@@ -55,14 +54,9 @@ License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: https://libvirt.org/
-
-%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1
-    %define mainturl stable_updates/
-%endif
-Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
+Source: https://libvirt.org/sources/libvirt-%{version}.tar.xz
 Source1: symlinks
 
-
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
 Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
@@ -102,11 +96,7 @@ BuildRequires: /usr/bin/pod2man
 %endif
 BuildRequires: gcc
 BuildRequires: git
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
-BuildRequires: perl-interpreter
-%else
 BuildRequires: perl
-%endif
 BuildRequires: %{python}
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -123,9 +113,7 @@ BuildRequires: bash-completion >= 2.0
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libtasn1-devel
-%if (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires: libgcrypt-devel
-%endif
+#BuildRequires: libgcrypt-devel
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
 # For pool-build probing for existing pools
@@ -143,11 +131,7 @@ BuildRequires: yajl-devel
 BuildRequires: sanlock-devel >= 2.4
 %endif
 BuildRequires: libpcap-devel
-%if 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: libnl-devel
-%else
 BuildRequires: libnl3-devel
-%endif
 BuildRequires: avahi-devel
 BuildRequires: libselinux-devel
 BuildRequires: dnsmasq >= 2.41
@@ -159,11 +143,7 @@ BuildRequires: radvd
 BuildRequires: ebtables
 BuildRequires: module-init-tools
 BuildRequires: cyrus-sasl-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: polkit >= 0.112
-%else
-BuildRequires: polkit >= 0.93
-%endif
 # For mount/umount in FS driver
 BuildRequires: util-linux
 %if %{with_qemu}
@@ -182,12 +162,8 @@ BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
 %if %{with_storage_rbd}
-    %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: librados2-devel
 BuildRequires: librbd1-devel
-    %else
-BuildRequires: ceph-devel
-    %endif
 %endif
 %if %{with_storage_gluster}
 BuildRequires: glusterfs-api-devel >= 3.4.1
@@ -213,12 +189,7 @@ BuildRequires: fuse-devel >= 2.8.6
 %if %{with_phyp} || %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
 %endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: netcf-devel >= 0.2.2
-%else
-BuildRequires: netcf-devel >= 0.1.8
-%endif
 %if %{with_esx}
 BuildRequires: libcurl-devel
 %endif
@@ -228,63 +199,53 @@ BuildRequires: libwsman-devel >= 2.2.3
 BuildRequires: audit-libs-devel
 # we need /usr/sbin/dtrace
 BuildRequires: systemtap-sdt-devel
-
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
-
 # Communication with the firewall and polkit daemons use DBus
 BuildRequires: dbus-devel
-
 # Fedora build root suckage
 BuildRequires: gawk
-
 # For storage wiping with different algorithms
 BuildRequires: scrub
-
 %if %{with_numad}
 BuildRequires: numad
 %endif
-
 %if %{with_wireshark}
 BuildRequires: wireshark-devel >= 2.1.0
 %endif
-
 %if %{with_libssh}
 BuildRequires: libssh-devel >= 0.7.0
 %endif
-
 %if 0%{?fedora} > 27 || 0%{?rhel} > 7
 BuildRequires: rpcgen
 BuildRequires: libtirpc-devel
 %endif
-
 Provides: bundled(gnulib)
 
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
 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
 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)
-
 # The client side, i.e. shared libs are in a subpackage
 Requires: %{name}-libs = %{version}-%{release}
-
 # for modprobe of pci devices
 Requires: module-init-tools
 # for /sbin/ip & /sbin/tc