[spacewalk-admin] Rebase to spacewalk-admin-1.9.10-1.fc18 in rawhide.

[Miroslav Suchý]

commit a65d8eb34c8feb42a433f69aa1a897e81ec843ef
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Wed Mar 6 16:45:13 2013 +0100

    Rebase to spacewalk-admin-1.9.10-1.fc18 in rawhide.

 .gitignore           |    1 +
 sources              |    2 +-
 spacewalk-admin.spec |   55 ++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 53 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe669ef..9b011be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /spacewalk-admin-1.8.3.tar.gz
 /spacewalk-admin-1.8.6.tar.gz
+/spacewalk-admin-1.9.10.tar.gz
diff --git a/sources b/sources
index 46699fe..7cade01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96a2e642ab95a84302010cc03828a7ab  spacewalk-admin-1.8.6.tar.gz
+912ebfe34b8da37a0c739dbac48e19bd  spacewalk-admin-1.9.10.tar.gz
diff --git a/spacewalk-admin.spec b/spacewalk-admin.spec
index 47d2b3d..07ab0c4 100644
--- a/spacewalk-admin.spec
+++ b/spacewalk-admin.spec
@@ -2,8 +2,8 @@
 Summary: Various utility scripts and data files for RHN Satellite installations
 Name: spacewalk-admin
 URL:     https://fedorahosted.org/spacewalk
-Version: 1.8.6
-Release: 2%{?dist}
+Version: 1.9.10
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 License: GPLv2
 Group: Applications/Internet
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: spacewalk-base
 Requires: perl-URI, perl(MIME::Base64)
 Requires: lsof
+BuildRequires: /usr/bin/pod2man
 Obsoletes: satellite-utils < 5.3.0
 Provides: satellite-utils = 5.3.0
 Obsoletes: rhn-satellite-admin < 5.3.0
@@ -27,6 +28,11 @@ Various utility scripts and data files for Spacewalk installations.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if 0%{?fedora}
+mv -f spacewalk-service.systemd spacewalk-service
+make -f Makefile.admin install_systemd PREFIX=$RPM_BUILD_ROOT
+%endif
 make -f Makefile.admin install PREFIX=$RPM_BUILD_ROOT
 
 (cd $RPM_BUILD_ROOT/%{_bindir} && ln -s validate-sat-cert.pl validate-sat-cert)
@@ -51,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %doc LICENSE
 %dir %{rhnroot}
+%{_sbindir}/spacewalk-startup-helper
 %{_sbindir}/spacewalk-service
 %{_sbindir}/rhn-satellite
 %{_bindir}/validate-sat-cert.pl
@@ -73,10 +80,50 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/rhn-deploy-ca-cert.pl.8*
 %{_mandir}/man8/rhn-install-ssl-cert.pl.8*
 %config(noreplace) %{_sysconfdir}/rhn/service-list
+%if 0%{?fedora}
+%{_unitdir}/spacewalk.target
+%{_unitdir}/spacewalk-wait-for-tomcat.service
+%{_unitdir}/spacewalk-wait-for-jabberd.service
+%endif
 
 %changelog
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Wed Feb 27 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.10-1
+- let systemd report service as active
+
+* Tue Feb 26 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.9-1
+- suppress journal messages
+
+* Fri Feb 22 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.8-1
+- wait both for application and administration port to be ready
+
+* Tue Feb 19 2013 Jan Pazdziora 1.9.7-1
+- The ensure-httpd-down will sleep in the loop, no need to have it in the main
+  script.
+- Fixing the wait-for-tomcat-disable logic.
+
+* Mon Feb 18 2013 Miroslav Suchý <msuchy at redhat.com> 1.9.6-1
+- Buildrequire pod2man
+
+* Thu Feb 14 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.5-1
+- wait-for-tomcat has been moved to helper
+- let's osa-dispatcher wait for jabberd startup
+- include systemd target and services
+
+* Tue Feb 12 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.4-1
+- added systemd version of spacewalk-service
+- systemd target for spacewalk
+- moved waiting for jabberd to helper
+- moved ensure_httpd_down() into script
+- moved wait-for-tomcat into general startup helper
+
+* Mon Dec 10 2012 Jan Pazdziora 1.9.3-1
+- The systemd service files are not executable, using -e.
+
+* Fri Dec 07 2012 Jan Pazdziora 1.9.2-1
+- Fixing typo.
+
+* Tue Dec 04 2012 Jan Pazdziora 1.9.1-1
+- On Fedoras, start to use tomcat >= 7.
 
 * Tue Oct 30 2012 Jan Pazdziora 1.8.6-1
 - Update the copyright year.