[rhnsd] Rebase to rhnsd-5.0.9-1.fc18 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Wed Mar 6 15:20:41 UTC 2013


commit b05aaa0f15bb105242bb4b925d5ff1d526c37bca
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Wed Mar 6 16:20:27 2013 +0100

    Rebase to rhnsd-5.0.9-1.fc18 in rawhide.

 .gitignore |    1 +
 rhnsd.spec |   67 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources    |    2 +-
 3 files changed, 56 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 026c9ea..fc1a517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ rhnsd-4.9.3.tar.gz
 /rhnsd-4.9.14.tar.gz
 /rhnsd-4.9.15.tar.gz
 /rhnsd-5.0.4.tar.gz
+/rhnsd-5.0.9.tar.gz
diff --git a/rhnsd.spec b/rhnsd.spec
index 28716d9..b7b6f07 100644
--- a/rhnsd.spec
+++ b/rhnsd.spec
@@ -4,13 +4,17 @@ 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.4
-Release: 2%{?dist}
+Version: 5.0.9
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
 
 Requires: rhn-check >= 0.0.8
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
 %if 0%{?suse_version}
 Requires(post): aaa_base
 Requires(preun): aaa_base
@@ -48,10 +52,10 @@ make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"
 rm -rf $RPM_BUILD_ROOT
 make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} INIT_DIR=$RPM_BUILD_ROOT/%{_initrddir}
 
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1210
 install -m 0755 rhnsd.init.SUSE $RPM_BUILD_ROOT/%{_initrddir}/rhnsd
 %endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
 rm $RPM_BUILD_ROOT/%{_initrddir}/rhnsd
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
@@ -59,39 +63,58 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
 
 %find_lang %{name}
 
+%if 0%{?suse_version} >= 1210
+%pre
+%service_add_pre rhnsd.service
+%endif
 
 %post
-/sbin/chkconfig --add rhnsd
+%if 0%{?suse_version} >= 1210
+%service_add_post rhnsd.service
+%else
+if [ -f /etc/init.d/rhnsd ]; then
+    /sbin/chkconfig --add rhnsd
+fi
+%endif
 
 %preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun rhnsd.service
+%else
 if [ $1 = 0 ] ; then
     %if 0%{?fedora}
-    /bin/systemctl stop rhnsd >/dev/null 2>&1
+    /bin/systemctl stop rhnsd.service >/dev/null 2>&1
     %else
     service rhnsd stop >/dev/null 2>&1
     %endif
-    /sbin/chkconfig --del rhnsd
+    if [ -f /etc/init.d/rhnsd ]; then
+        /sbin/chkconfig --del rhnsd
+    fi
 fi
-
+%endif
 
 %postun
+%if 0%{?suse_version} >= 1210
+%service_del_postun rhnsd.service
+%else
 if [ "$1" -ge "1" ]; then
     %if 0%{?fedora}
-    /bin/systemctl condrestart rhnsd >/dev/null 2>&1 || :
+    /bin/systemctl condrestart rhnsd.service >/dev/null 2>&1 || :
     %else
     service rhnsd condrestart >/dev/null 2>&1 || :
     %endif
 fi
+%endif
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang 
+%files -f %{name}.lang
 %dir %{_sysconfdir}/sysconfig/rhn
 %config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
 %{_sbindir}/rhnsd
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
 %{_unitdir}/rhnsd.service
 %else
 %{_initrddir}/rhnsd
@@ -100,8 +123,26 @@ rm -fr $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* 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.
+- Download translations from Transifex for rhnsd.
+
+* Fri Nov 30 2012 Jan Pazdziora 5.0.8-1
+- Revert "876328 - updating rhel client tools translations"
+
+* Mon Nov 19 2012 Jan Pazdziora 5.0.7-1
+- Only run chkconfig if we are in the SysV world.
+- rhnsd needs to be marked as forking.
+- When talking to systemctl, we need to say .service.
+
+* Fri Nov 16 2012 Jan Pazdziora 5.0.6-1
+- 876328 - updating rhel client tools translations
+
+* Sun Nov 11 2012 Michael Calmer <mc at suse.de> 5.0.5-1
+- use systemd on openSUSE >= 12.1
+- do not start rhnsd in runlevel 2 which has no network
+- no use of /var/lock/subsys/ anymore
 
 * Tue Oct 30 2012 Jan Pazdziora 5.0.4-1
 - Update .po and .pot files for rhnsd.
diff --git a/sources b/sources
index a5b0c2a..c8ec9db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d071a1a1961d5b20e73f6aa30c6246d4  rhnsd-5.0.4.tar.gz
+2328bd22e0877c8359d52a5555ca735b  rhnsd-5.0.9.tar.gz


More information about the scm-commits mailing list