Fabian Deutsch has uploaded a new change for review. Change subject: spec: Drop el6 conditionals and bundled minimizer ......................................................................
spec: Drop el6 conditionals and bundled minimizer Change-Id: I1c30ceabb0a31d90513645df86517905ea9593fc Signed-off-by: Fabian Deutsch <[email protected]> --- M ovirt-node.spec.in 1 file changed, 6 insertions(+), 64 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/89/43389/1 diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index a6efe47..fcbad74 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -7,11 +7,7 @@ %define is_centos_systemd %(test 0%{?centos} -ne 0 && test %{?centos} -ge 7 && echo 1 || echo 0) %define is_systemd %( test %{is_rhel_systemd} -eq 1 || test %{is_centos_systemd} = 1 || test %{is_fedora_systemd} = 1 && echo 1 || echo 0) %define dracutdir %(test -e /usr/share/dracut && echo "/usr/share/dracut/modules.d" || echo "/usr/lib/dracut/modules.d") -%define is_el6 %(test 0%{?centos} -eq 06 || test 0%{?rhel} -eq 06 && echo 1 || echo 0) %define is_el7 %(test 0%{?centos} -eq 07 || test 0%{?rhel} -eq 07 && echo 1 || echo 0) - -# The minimizer is only bundled on el6, because it is available on Fedora -%define with_minimizer 0%{?is_el6} # RHN Plugin is only build on RHEL %define with_rhn 0%{?rhel} @@ -49,9 +45,7 @@ Requires(preun): systemd-units Requires: python-IPy %endif -%if ! 0%{?is_el6} Requires: python-augeas -%endif Requires: system-release Requires: augeas >= 0.3.5 Requires: bridge-utils @@ -81,11 +75,7 @@ Requires: cracklib-python Requires: dracut Requires: openssh-server -%if %{is_el6} -Requires: /bin/hostname -%else Requires: hostname -%endif Requires: tuned Requires: NetworkManager %if 0%{?is_systemd} @@ -154,9 +144,6 @@ Group: Applications/System -%if 0%{with_minimizer} -Requires: ovirt-node-minimizer -%else %if 0%{?centos} Requires: livecd-tools >= 13.4.4 %else @@ -301,11 +288,7 @@ # %global selinux_modulename ovirt %global selinux_variants targeted -%if %{is_el6} -%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) -%else %global selinux_policyver %_selinux_policy_version -%endif %package selinux Summary: SELinux policy module supporting %{product_family} @@ -412,29 +395,12 @@ %endif -# -# minimizer subpackage -# -%if 0%{?with_minimizer} -%package minimizer -Summary: The image-minimizer tool -Group: Applications/System -Obsoletes: appliance-tools-minimizer - - -%description minimizer -This package ships the image-minimizer tool. -This tool is used to remove unneeded rpms and files from a filesystem tree. - -# </minimizer subpackage> -%endif - # # oVirt Brand subpackage # %package branding-ovirt -Summary: oVirt branding for oVirt Node +Summary: Branding for oVirt Node Group: Applications/System %description branding-ovirt @@ -475,14 +441,8 @@ Requires: system-release Requires: ntp Requires: udev >= 147-2.34 -%if ! 0%{?is_el6} Requires: python-augeas -%endif -%if %{is_el6} -Requires: /bin/hostname -%else Requires: hostname -%endif Requires: NetworkManager %if 0%{?is_systemd} Requires: grub2 @@ -581,7 +541,11 @@ %prep -%setup -q -n "%{name}-@PACKAGE_VERSION@" +%if 0%{?use_snapshot} +%setup -q -n"%{name}-%{?shortcommit}" +%else +%setup -q -n"%{name}-%{version}" +%endif %build @@ -625,12 +589,6 @@ %{__install} -p -m0644 dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch %{buildroot}%{app_root} %endif -# python-augeas is not in RHEL-6 -%if 0%{?is_el6} -# specific version of python-augeas is not available in Fedora yet -%{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib} -%endif - # Install SELinux policy module cd semodule %{__install} -d %{buildroot}%{_datadir}/selinux @@ -654,10 +612,7 @@ %{buildroot}/%{_initrddir}/ovirt-node-igor-slave %endif -# Remove minimizer if unneeded -%if ! 0%{?with_minimizer} %{__rm} -vf %{buildroot}/%{_sbindir}/image-minimizer -%endif # Remove rhn stuff if not needed %if ! 0%{?with_rhn} @@ -667,10 +622,6 @@ rmdir %{buildroot}/%{python_sitelib}/ovirt/node/setup/rhn/ %endif -# Remove augeas.py if not needed -%if ! 0%{?is_el6} -%{__rm} -vf %{buildroot}/%{python_sitelib}/augeas* -%endif %clean @@ -954,12 +905,6 @@ %{_datadir}/selinux/*/%{selinux_modulename}.pp -%if 0%{?with_minimizer} -%files minimizer -%{_sbindir}/image-minimizer -%endif - - %files branding-ovirt %{python_sitelib}/ovirt/node/presets.py* @@ -1010,9 +955,6 @@ %exclude %{python_sitelib}/ovirt_config_setup/cim.py* %exclude %{python_sitelib}/ovirt_config_setup/snmp.py* %{python_sitelib}/ovirtnode -%if 0%{?is_el6} -%{python_sitelib}/augeas* -%endif %{_sysconfdir}/ovirt-early.d %dir %{_sysconfdir}/ovirt-commandline.d %if 0%{?is_systemd} -- To view, visit https://gerrit.ovirt.org/43389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c30ceabb0a31d90513645df86517905ea9593fc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
