Change in vdsm[master]: Remove el6 specific code from spec

ybronhei at redhat.com ybronhei at redhat.com
Sun Jun 14 11:12:16 UTC 2015


Yaniv Bronhaim has uploaded a new change for review.

Change subject: Remove el6 specific code from spec
......................................................................

Remove el6 specific code from spec

Change-Id: Ifef95b7c61b8bd8c86ef2642e74275da87659cb8
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 65 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/42317/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 2f7a936..287d405 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -57,13 +57,8 @@
 %global with_systemd 1
 %endif
 
-%if 0%{?rhel} == 6
-%global _udevrulesdir /lib/udev/rules.d/
-%global _udevexecdir /lib/udev/
-%else
 %global _udevrulesdir /usr/lib/udev/rules.d/
 %global _udevexecdir /usr/lib/udev/
-%endif
 
 Name:           %{vdsm_name}
 Version:        @PACKAGE_VERSION@
@@ -105,15 +100,7 @@
 BuildRequires: python-pthreading
 BuildRequires: qemu-img
 BuildRequires: rpm-python
-%if 0%{?rhel} == 6
-BuildRequires: python-simplejson >= 2.0.9
-BuildRequires: policycoreutils-python > 2.0.83-19.47
-BuildRequires: python-argparse
-BuildRequires: python-ordereddict
-%endif
-%if 0%{?rhel} > 6 || 0%{?fedora}
 BuildRequires: python-blivet
-%endif
 
 # Autotools BuildRequires
 %if 0%{?enable_autotools}
@@ -170,14 +157,12 @@
 Requires: libguestfs-tools-c >= 1:1.26.7-2
 %endif
 
-%if 0%{?rhel} >= 7 || 0%{?fedora}
 Requires: libvirt-daemon-config-nwfilter
 Requires: libvirt-daemon-driver-network
 Requires: libvirt-daemon-driver-nwfilter
 Requires: libvirt-daemon-driver-qemu
-%endif
 
-%if 0%{?rhel} >= 7
+%if 0%{?rhel}
 %if 0%{?rhev_build}
 Requires: libvirt-daemon >= 1.2.8-16.el7_1.2
 Requires: libvirt-python >= 1.2.8-7.el7_1.1
@@ -185,12 +170,7 @@
 Requires: libvirt-daemon >= 1.2.8-15.el7
 Requires: libvirt-python >= 1.2.8-5.el7
 %endif # rhev_build
-%endif # rhel 7
-
-%if 0%{?rhel} == 6
-Requires: libvirt >= 0.10.2-29.el6_5.4
-Requires: libvirt-python
-%endif
+%endif # rhel
 
 %if 0%{?fedora} >= 22
 Requires: libvirt-daemon >= 1.2.13
@@ -206,11 +186,7 @@
 
 # iscsi-intiator versions
 %if 0%{?rhel}
-%if 0%{?rhel} >= 7
 Requires: iscsi-initiator-utils
-%else
-Requires: iscsi-initiator-utils >= 6.2.0.872-15
-%endif # rhel 7
 %else # fedora
 Requires: iscsi-initiator-utils >= 6.2.0.873-21
 %endif
@@ -218,7 +194,6 @@
 Requires: sanlock >= 2.8, sanlock-python
 
 %if 0%{?rhel}
-%if 0%{?rhel} >= 7
 Requires: device-mapper-multipath >= 0.4.9-68
 Requires: e2fsprogs
 Requires: fence-agents-all
@@ -226,19 +201,6 @@
 Requires: python
 Requires: policycoreutils-python
 Requires: selinux-policy-targeted >= 3.13.1-16.el7
-%else
-Requires: python
-Requires: device-mapper-multipath >= 0.4.9-75
-Requires: e2fsprogs >= 1.41.12-11
-Requires: fence-agents
-Requires: kernel >= 2.6.32-465
-Requires: initscripts >= 9.03.31-2.el6_3.1
-Requires: policycoreutils >= 2.0.83-19.30
-Requires: policycoreutils-python >= 2.0.83-19.47.el6_6.1
-Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.2
-Requires: lvm2 >= 2.02.100-5
-Requires: logrotate < 3.8.0
-%endif
 %else
 Requires: fence-agents-all
 Requires: kernel >= 3.11.3-201
@@ -267,13 +229,8 @@
 %endif  # !%{fedora_koji_build}
 
 %if 0%{?rhel}
-%if 0%{?rhel} >= 7
 Requires: qemu-kvm%{?qemu_suffix} >= 10:2.1.2-23.el7_1.2
 Requires: qemu-img%{?qemu_suffix} >= 10:2.1.2-23.el7_1.2
-%else
-Requires: qemu-kvm%{?qemu_suffix} >= 2:0.12.1.2-2.422
-Requires: qemu-img%{?qemu_suffix} >= 2:0.12.1.2-2.422
-%endif  # rhel > = 7
 %else
 Requires: qemu-kvm >= 2:2.0.0-1
 Requires: qemu-img >= 2:2.0.0-1
@@ -337,10 +294,6 @@
 Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-yajsonrpc = %{version}-%{release}
 Obsoletes:      vdsm-api < 4.16
-%if 0%{?rhel} == 6
-Requires:       python-ordereddict
-Requires:       python-simplejson >= 2.0.9
-%endif
 
 %description jsonrpc
 A Json-based RPC interface that serves as the protocol for libvdsm.
@@ -652,9 +605,6 @@
 
 %prep
 %setup -q
-%if 0%{?rhel} == 6
-sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
-%endif
 
 %build
 %if 0%{?enable_autotools}
@@ -735,19 +685,12 @@
 %endif
 
 # Install the polkit for libvirt
-%if 0%{?fedora} || 0%{?rhel} >= 7
 install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
                  %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules
-%else
-install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
-                 %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
 
 # Install the libvirt hook for cleaning up the XML
-%if 0%{?fedora} || 0%{?rhel} >= 7
 install -Dm 0755 vdsm/virt/libvirt-hook.sh \
                  %{buildroot}%{_sysconfdir}/libvirt/hooks/qemu
-%endif
 
 %check
 %if 0%{?with_check}
@@ -1038,9 +981,7 @@
 %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh
 %{_sysconfdir}/sudoers.d/50_vdsm
 %{_sysconfdir}/cron.hourly/vdsm-logrotate
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_sysconfdir}/libvirt/hooks/qemu
-%endif
 %{_datadir}/%{vdsm_name}/logUtils.py*
 %{_datadir}/%{vdsm_name}/dsaversion.py*
 %{_libexecdir}/%{vdsm_name}/curl-img-wrap
@@ -1199,11 +1140,7 @@
 %if 0%{?rhel}
 %dir %{_localstatedir}/log/core
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_polkitdir}/10-vdsm-libvirt-access.rules
-%else
-%{_polkitdir}/10-vdsm-libvirt-access.pkla
-%endif
 
 %defattr(-, %{vdsm_user}, %{qemu_group}, -)
 %dir %{_localstatedir}/lib/libvirt/qemu/channels


-- 
To view, visit https://gerrit.ovirt.org/42317
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifef95b7c61b8bd8c86ef2642e74275da87659cb8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list