branding/spacewalk-branding.spec | 40 +++++++++++------------------------ rel-eng/packages/spacewalk-setup | 2 - spacewalk/setup/bin/spacewalk-setup | 2 - spacewalk/setup/spacewalk-setup.spec | 7 +++++- 4 files changed, 21 insertions(+), 30 deletions(-)
New commits: commit f1e9af27fc3fd109a3f1593a952e35fd3439f444 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Mar 22 15:10:36 2013 +0100
Automatic commit of package [spacewalk-setup] release [1.10.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 68d09ad..bd6f2b0 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.10.1-1 spacewalk/setup/ +1.10.2-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 254ce1e..796ab1e 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.10.1 +Version: 1.10.2 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk
@@ -99,6 +99,11 @@ rm -rf %{buildroot} %doc LICENSE
%changelog +* Fri Mar 22 2013 Michael Mraka michael.mraka@redhat.com 1.10.2-1 +- supress systemd messages during setup +- Use multiparameter system to better predictability. +- We do not want to run cobbler sync when cobblerd is not running. + * Thu Mar 21 2013 Jan Pazdziora 1.10.1-1 - Silence new LWP which is not happy about SSL verification (fix the redirects).
commit 4070dad85f257cec5b7c4b2112581822b48d56b7 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Mar 22 15:07:25 2013 +0100
supress systemd messages during setup
silencing ln -s '/usr/lib/systemd/system/tftp.socket' '/etc/systemd/system/sockets.target.wants/tftp.socket'
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 80e31a6..c1d9eec 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -289,7 +289,7 @@ sub setup_cobbler {
if (($answers{'enable-tftp'} and $answers{'enable-tftp'} =~ /^[Yy]/) || $opts{"non-interactive"}) { if (-e '/usr/lib/systemd/system/tftp.socket') { - system("systemctl enable tftp.socket"); + system("systemctl --quiet enable tftp.socket"); } else { system("chkconfig tftp on"); system("chkconfig xinetd on");
commit 3dcf330b45023080592024d979a1a09c46c63d42 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Mar 22 11:33:39 2013 +0100
simplify tomcat version decisison
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 13bcaae..db804b8 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,3 +1,13 @@ +%if 0%{?rhel} && 0%{?rhel} < 6 +%global tomcat tomcat5 +%else +%if 0%{?fedora} +%global tomcat tomcat +%else +%global tomcat tomcat6 +%endif +%endif + Name: spacewalk-branding Version: 1.10.9 Release: 1%{?dist} @@ -32,15 +42,7 @@ install -d -m 755 %{buildroot}%{_datadir}/spacewalk install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/ -%if 0%{?rhel} && 0%{?rhel} < 6 -install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/ -%else -%if 0%{?fedora} -install -d -m 755 %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/ -%else -install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/ -%endif -%endif +install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/ install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults cp -pR css %{buildroot}/%{_var}/www/html/ @@ -52,15 +54,7 @@ cp -pR templates %{buildroot}%{_datadir}/spacewalk/web/ cp -pR styles %{buildroot}%{_datadir}/spacewalk/web/nav/ cp -pR setup %{buildroot}%{_datadir}/spacewalk/ cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/ -%if 0%{?rhel} && 0%{?rhel} < 6 -ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar -%else -%if 0%{?fedora} -ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar -%else -ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar -%endif -%endif +ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/java-branding.jar cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%clean @@ -75,15 +69,7 @@ rm -rf %{buildroot} %{_var}/www/html/favicon.ico %{_datadir}/spacewalk/ %{_datadir}/rhn/lib/java-branding.jar -%if 0%{?rhel} && 0%{?rhel} < 6 -%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar -%else -%if 0%{?fedora} -%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar -%else -%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar -%endif -%endif +%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/java-branding.jar %{_prefix}/share/rhn/config-defaults/rhn_docs.conf %doc LICENSE