[rhnmd] Rebase to rhnmd-5.3.17-1.fc19 in rawhide.

Mon Jul 22 08:02:49 UTC 2013

commit 92d586e140c7d6325858480d4a9aa7667e804c05
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 22 10:02:29 2013 +0200

    Rebase to rhnmd-5.3.17-1.fc19 in rawhide.

 .gitignore |    1 +
 rhnmd.spec |   82 +++++++++---------------------------------------------------
 sources    |    2 +-
 3 files changed, 14 insertions(+), 71 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 053d6b9..8677506 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /rhnmd-5.3.10.tar.gz
 /rhnmd-5.3.11.tar.gz
 /rhnmd-5.3.15.tar.gz
+/rhnmd-5.3.17.tar.gz
diff --git a/rhnmd.spec b/rhnmd.spec
index d6419fc..f12618a 100644
--- a/rhnmd.spec
+++ b/rhnmd.spec
@@ -1,14 +1,15 @@
 %global np_name nocpulse
 %global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
 %if 0%{!?_initddir:1}
 %global _initddir %{_sysconfdir}/rc.d/init.d
 %endif
 
-Summary:        Red Hat Network Monitoring Daemon
+Summary:        Spacewalk Monitoring Daemon
 Name:           rhnmd
 URL:            https://fedorahosted.org/spacewalk
 Source0:        https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version:        5.3.15
+Version:        5.3.17
 Release:        1%{?dist}
 License:        GPLv2
 BuildArch:      noarch
@@ -46,7 +47,7 @@ Obsoletes:      rhnmd.x86_64 < 5.3.0-5
 Provides:       rhnmd.i386 = %{version}
 Provides:       rhnmd.x86_64 = %{version}
 
-Requires(post): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon
 Requires(preun): /usr/sbin/semanage
 
 %description
@@ -123,7 +124,7 @@ fi
 %if !0%{?suse_version}
 if [ ! -f %{identity} ]
 then
-    /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
+    %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
 fi
 %endif
 %if 0%{?suse_version} >= 1210
@@ -187,6 +188,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Tue May 21 2013 Tomas Kasparek <tkasparek at redhat.com> 5.3.17-1
+- misc branding clean up
+
+* Fri Mar 22 2013 Michael Mraka <michael.mraka at redhat.com> 5.3.16-1
+- 919468 - fixed path in file based Requires
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
 * Fri Jan 04 2013 Jan Pazdziora 5.3.15-1
 - We may need to define the port 4545 as ours to use.
 - The daemon does success for us.
@@ -220,69 +228,3 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Apr 19 2010 Michael Mraka <michael.mraka at redhat.com> 5.3.7-1
 - 578738 - obsolete archs - we are noarch now
 
-* Wed Dec 16 2009 Miroslav Suchý <msuchy at redhat.com> 5.3.5-1
-- 538057 - fix typo
-- 538057 - use proper text indention. The content of tags like Name, Version, ... usually starts at 17 characters
-- 538057 - move %%preun before %%clean and %%files
-- 538057 - do not use wildcards
-- 538057 - preserve timestamp of the source files
-- 538057 - %%{_initrddir} is considered deprecated on Fedora, but still needed on RHEL
-- 538057 - Use %%global instead of %%define
-
-* Mon Nov  2 2009 Miroslav Suchý <msuchy at redhat.com> 5.3.3-1
-- make rhnmd package noarch
-
-* Fri Apr 10 2009 Miroslav Suchý <msuchy at redhat.com> 5.3.2-1
-- 494538 - remove the dependency of rhnmd on nocpulse-common
-
-* Tue Apr  7 2009 Miroslav Suchý <msuchy at redhat.com> 5.3.1-1
-- authorized_keys should be owned by nocpulse
-- bump up version to 5.3.0
-
-* Wed Mar 11 2009 Miroslav Suchy <msuchy at redhat.com> 5.1.7-1
-- 489573 - remove generating keys and leave it on nocpulse-common
-
-* Sat Feb 28 2009 Dennis Gilmore <dennis at ausil.us> 5.1.6-1
-- rebuild 
-
-* Thu Feb 05 2009 jesus m. rodriguez <jesusr at redhat.com> 5.1.5-1
-- 479541, 483867 - replaced runuser with /sbin/runuser
-
-* Tue Jan 13 2009 Milan Zazrivec 5.1.4-1
-- bz #479830 - %%post error when installing rhnmd-5.1.2-1 on RHEL-5
-- package should create nocpulse user instead of rhnmd
-
-* Wed Nov 26 2008 Miroslav Suchy <msuchy at redhat.com> 5.1.2-1
-- fix spec so it can actually be build
-
-* Tue Oct 21 2008 Michael Mraka <michael.mraka at redhat.com> 5.1.1-1
-- resolves #467877 - use runuser instead of su
-
-* Fri Oct 17 2008 Miroslav Suchy <msuchy at redhat.com> 
-- cleanup spec
-
-* Wed Sep 12 2007 Pradeep Kilambi <pkilambi at redhat.com> - 5.1.0-1
-- new build
-
-* Mon May 24 2007 Pradeep Kilambi <pkilambi at redhat.com> - 5.0.0-8
-- Resolves#240764
-
-* Mon May 14 2007 Devan Goodwin <dgoodwin at redhat.com> - 5.0.0-6
-- Correcting selinux problem with userdel and /opt.
-
-* Mon May 07 2007 Mike McCune <mmccune at redhat.com> - 5.0.0-4
-- creating ssh key outside of service startup in order to keep selinux happy
-
-* Wed Mar 07 2007 Pradeep Kilambi <pkilambi at redhat.com> - 5.0.0-1
-- adding dist tag
-
-* Thu Jun 23 2005 Nick Hansen <nhansen at redhat.com> 4.0.0-8
-- enable building on multiple arches
-
-* Thu Jun  9 2005 Nick Hansen <nhansen at redhat.com>
-- BZ#159664: adding conflict on NPusers so this can't 
-  be installed on Satellite or Proxy monitoring boxes
-
-* Wed Aug  4 2004 Nick Hansen <nhansen at redhat.com>
-- Initial build.
-
diff --git a/sources b/sources
index 9f1901d..3532fed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d694bc9f3e765b8a9b8c57cde6b9e569  rhnmd-5.3.15.tar.gz
+d170a19e0f3fc4ad03c1710f1b0f580e  rhnmd-5.3.17.tar.gz
