client/rhel/rhn-client-tools/rhn-client-tools.spec | 18 ++++++++++++++++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit fecb588641d1fced62e0ce8f94f447e52c8d4b03
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 28 18:01:07 2013 +0200
Automatic commit of package [rhn-client-tools] release [2.1.4-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3698b79..f7456a7 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -357,6 +357,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Aug 28 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.4-1
+- No firstboot modules on RHEL 7 and later
+
* Thu Aug 15 2013 Stephen Herr <sherr(a)redhat.com> 2.1.3-1
- 919432 - rhn-client-tools should correctly conflict with old virt-host
versions
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 6db126e..8d9dbac 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-2.1.3-1 client/rhel/rhn-client-tools/
+2.1.4-1 client/rhel/rhn-client-tools/
commit 4742ea5b6be848346ac5323ce626f9500765d7fa
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 28 17:57:07 2013 +0200
No firstboot modules on RHEL 7 and later
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 0abc350..3698b79 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -152,9 +152,18 @@ rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
%endif
-%if 0%{?rhel} > 0 && 0%{?rhel} < 6
+%if 0%{?rhel} > 0
+%if 0%{?rhel} < 6
rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/firstboot
rm -f $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_register.*
+%endif
+%if 0%{?rhel} == 6
+rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
+%endif
+%if 0%{?rhel} > 6
+rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/firstboot
+rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/
+%endif
%else
rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
%endif
@@ -317,6 +326,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*
%else
+%if 0%{?rhel} < 7
%{_datadir}/firstboot/modules/rhn_register.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_login_gui.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_start_gui.*
@@ -327,6 +337,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/firstboot/rhn_review_gui.*
%{_datadir}/rhn/up2date_client/firstboot/rhn_finish_gui.*
%endif
+%endif
%if 0%{?suse_version}
# on SUSE these directories are part of packages not installed