Dan Kenigsberg has uploaded a new change for review. Change subject: spec: janitorial: drop references to fedora 18 ......................................................................
spec: janitorial: drop references to fedora 18 We no longer support anything below Fedora 19, so ancient complexities can be ignored. Change-Id: I268f5921942590bc661d1b29cd08d3e15a96826d Signed-off-by: Dan Kenigsberg <[email protected]> --- M vdsm.spec.in 1 file changed, 6 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/33379/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index bc3b125..48cc1f7 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -26,25 +26,20 @@ %endif # Required paths -%if 0%{?fedora} >= 18 +%if 0%{?fedora} %global _polkitdir %{_datadir}/polkit-1/rules.d %else %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 %global with_gluster 1 -%endif %if ! 0%{?rhel} %global with_vhostmd 1 %endif -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_systemd 1 -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %global with_systemd_macros 1 %global with_tmpfiles_macro 1 %endif @@ -151,7 +146,7 @@ Requires: libguestfs-tools-c >= 1:1.26.7-2 %endif -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18 +%if 0%{?rhel} >= 7 || 0%{?fedora} Requires: libvirt-daemon >= 1.0.2-1 Requires: libvirt-daemon-config-nwfilter Requires: libvirt-daemon-driver-network @@ -585,7 +580,7 @@ %package hook-sriov Summary: sr-iov support for VDSM -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18 +%if 0%{?rhel} >= 7 || 0%{?fedora} Requires: libvirt-daemon-driver-nodedev %endif BuildArch: noarch @@ -712,7 +707,7 @@ %endif # Install the polkit for libvirt -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 install -Dm 0644 vdsm/vdsm-libvirt-access.rules \ %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules %else @@ -1169,7 +1164,7 @@ %if 0%{?rhel} %dir %{_localstatedir}/log/core %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %{_polkitdir}/10-vdsm-libvirt-access.rules %else %{_polkitdir}/10-vdsm-libvirt-access.pkla -- To view, visit http://gerrit.ovirt.org/33379 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I268f5921942590bc661d1b29cd08d3e15a96826d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
