[rhnsd] Rebase to rhnsd-5.0.13-1.fc19 in rawhide.

Mon Jul 22 07:34:17 UTC 2013

commit 0ddaaab443eb6f7337b3b1ac4356c77092dc754f
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 22 09:34:07 2013 +0200

    Rebase to rhnsd-5.0.13-1.fc19 in rawhide.

 .gitignore |    1 +
 rhnsd.spec |  140 ++++++++++++++----------------------------------------------
 sources    |    2 +-
 3 files changed, 34 insertions(+), 109 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fc1a517..c22fbf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ rhnsd-4.9.3.tar.gz
 /rhnsd-4.9.15.tar.gz
 /rhnsd-5.0.4.tar.gz
 /rhnsd-5.0.9.tar.gz
+/rhnsd-5.0.13.tar.gz
diff --git a/rhnsd.spec b/rhnsd.spec
index b7b6f07..f39abb6 100644
--- a/rhnsd.spec
+++ b/rhnsd.spec
@@ -1,10 +1,10 @@
-Summary: Red Hat Network query daemon
+Summary: Spacewalk query daemon
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhnsd
-Version: 5.0.9
+Version: 5.0.13
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,6 +63,11 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
 
 %find_lang %{name}
 
+%{!?systemd_post: %global systemd_post() if [ $1 -eq 1 ] ; then /usr/bin/systemctl enable %%{?*} >/dev/null 2>&1 || : ; fi; }
+%{!?systemd_preun: %global systemd_preun() if [ $1 -eq 0 ] ; then /usr/bin/systemctl --no-reload disable %%{?*} > /dev/null 2>&1 || : ; /usr/bin/systemctl stop %%{?*} > /dev/null 2>&1 || : ; fi; }
+%{!?systemd_postun_with_restart: %global systemd_postun_with_restart() /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : ; if [ $1 -ge 1 ] ; then /usr/bin/systemctl try-restart %%{?*} >/dev/null 2>&1 || : ; fi; }
+
+
 %if 0%{?suse_version} >= 1210
 %pre
 %service_add_pre rhnsd.service
@@ -75,6 +80,16 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
 if [ -f /etc/init.d/rhnsd ]; then
     /sbin/chkconfig --add rhnsd
 fi
+if [ -f %{_unitdir}/rhnsd.service ]; then
+    %systemd_post rhnsd.service
+    if [ "$1" = "2" ]; then
+        # upgrade from old init.d
+        if [ -L /etc/rc2.d/S97rhnsd ]; then
+            /usr/bin/systemctl enable rhnsd.service >/dev/null 2>&1
+        fi
+        rm -f /etc/rc?.d/[SK]??rhnsd
+    fi
+fi
 %endif
 
 %preun
@@ -83,7 +98,7 @@ fi
 %else
 if [ $1 = 0 ] ; then
     %if 0%{?fedora}
-    /bin/systemctl stop rhnsd.service >/dev/null 2>&1
+        %systemd_preun rhnsd.service
     %else
     service rhnsd stop >/dev/null 2>&1
     %endif
@@ -99,7 +114,7 @@ fi
 %else
 if [ "$1" -ge "1" ]; then
     %if 0%{?fedora}
-    /bin/systemctl condrestart rhnsd.service >/dev/null 2>&1 || :
+    %systemd_postun_with_restart rhnsd.service
     %else
     service rhnsd condrestart >/dev/null 2>&1 || :
     %endif
@@ -123,6 +138,19 @@ rm -fr $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Mon Jun 17 2013 Michael Mraka <michael.mraka at redhat.com> 5.0.13-1
+- removed old CVS/SVN version ids
+
+* Mon Jun 17 2013 Tomas Kasparek <tkasparek at redhat.com> 5.0.12-1
+- rebranding few more strings in client stuff
+
+* Tue May 21 2013 Tomas Kasparek <tkasparek at redhat.com> 5.0.11-1
+- branding clean-up of rhel client stuff
+
+* Thu Apr 25 2013 Michael Mraka <michael.mraka at redhat.com> 5.0.10-1
+- let rhnsd.service be enabled after installation
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
 * Fri Feb 15 2013 Milan Zazrivec <mzazrivec at redhat.com> 5.0.9-1
 - Update .po and .pot files for rhnsd.
 - New translations from Transifex for rhnsd.
@@ -201,107 +229,3 @@ rm -fr $RPM_BUILD_ROOT
 - generate new pot file for rhnsd (msuchy at redhat.com)
 - l10n: Updates to Polish (pl) translation (raven at fedoraproject.org)
 
-* Fri Mar 19 2010 Jan Pazdziora 4.9.3-1
-- Check return value of regcomp, fix a memory leak (Joshua Roys)
-
-* Wed Feb 10 2010 Miroslav Suchý <msuchy at redhat.com> 4.9.2-1
-- Pass version define to the compiler (Jan Pazdziora)
-- 533895 - if init script is run user return code 4
-- 533891 - if reloading fails return code 7
-- 533891 - implement force-reload
-- 533867 - init script, wrong parameter should return 2
-
-* Tue Feb 09 2010 Jan Pazdziora 4.9.1-1
-- 563173 - change the logging and config processing logic
-
-* Thu Feb 04 2010 Michael Mraka <michael.mraka at redhat.com> 4.8.3-1
-- updated copyrights
-
-* Mon Jan 25 2010 Tomas Lestach <tlestach at redhat.com> 4.8.2-1
-- fixing systemid parsing (joshua.roys at gtri.gatech.edu)
-
-* Thu Jan 21 2010 Miroslav Suchý <msuchy at redhat.com> 4.8.1-1
-- bumping up version, to be ahead of rhel5 versions
-
-* Tue Dec  1 2009 Miroslav Suchý <msuchy at redhat.com> 4.5.16-1
-- 502234 - fixing issue where the rhnsd init script would fail to reload the configuration, a forward port of a patch from rhel 4 (jsherril at redhat.com)
-- 541682 - make env. for rhn_check consistent with osad (mzazrivec at redhat.com)
-
-* Wed Nov 25 2009 Miroslav Suchý <msuchy at redhat.com> 4.5.15-1
-- hardcode MANPATH
-
-* Fri Sep 25 2009 Tomas Lestach <tlestach at redhat.com> 4.5.14-1
-- removed hardcoded systemid path (tlestach at redhat.com)
-
-* Tue Sep 22 2009 Miroslav Suchý <msuchy at redhat.com> 4.5.13-1
-- use macros
-- pass CFLAGS on correct position
-- add LICENSE file
-- change header info to actual license
-
-* Mon Sep 21 2009 Miroslav Suchý <msuchy at redhat.com> 4.5.12-1
-- implement try-restart as alias for condrestart
-- add LSB header
-- change url, source0 and requires according to packaging guidelines
-
-* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 4.5.11-1
-- #503719 - fix for postun scriptlet error (pkilambi at redhat.com)
-
-* Tue Jul  7 2009 Pradeep Kilambi <pkilambi at redhat.com>
-- Resolves: #503719 - fix for postun scriptlet error
-
-* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 4.5.10-1
-- 243699: fixing the error code when unknown command is used with rhnsd init
-  (pkilambi at redhat.com)
-- updateing translations for rhnsd (pkilambi at redhat.com)
-
-* Wed Jun  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-3
-- Resolves:  #243699 -fixing error code for unknown command to rhnsd init script
-
-* Mon May 11 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.7.0-2
-- Updated translations.
-- Resolves:  #243699
-  
-* Tue Jan 27 2009 Miroslav Suchý <msuchy at redhat.com> 4.5.9-1
-- rebuild
-
-* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 4.5.8-1
-- Remove usage of version and sources files.
- 
-* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 4.5.7-1
-- Updated translations.
-- Related: #216837
-
-* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 4.5.6-1
-- Updated translations.
-
-* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 4.5.5-1
-- New and updated translations.
-
-* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 4.5.4-1
-- New and updated translations.
-
-* Tue Nov 14 2006 James Bowes <jbowes at redhat.com> - 4.5.3-1
-- Updated manual page.
-- Require gettext.
-
-* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 4.5.2-1
-- New and updated translations.
-
-* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 4.5.1-1
-- Fix for bz 163483: rhnsd spawns children with SIGPIPE set to SIG_IGN
-
-* Fri Jul 21 2006 James Bowes <jbowes at redhat.com> - 4.5.0-3
-- Require rhn-check, not rhn_check.
-
-* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 4.5.0-2
-- spec file cleanups.
-
-* Fri Jul 07 2006 James Bowes <jbowes at redhat.com> - 4.5.0-1
-- Release for RHEL5 matching with up2date.
-
-* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
-- Refer to the proper commands in the man page.
-
-* Tue Apr 11 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
-- initial split from main up2date package.
diff --git a/sources b/sources
index c8ec9db..50ea874 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2328bd22e0877c8359d52a5555ca735b  rhnsd-5.0.9.tar.gz
+0076a316dfea7f37502b811a95705ce9  rhnsd-5.0.13.tar.gz
