[rhnsd] Rebase to rhnsd-4.9.14-1.fc16 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Mon Jan 2 14:41:43 UTC 2012


commit e847d1702472cce016a6c79469b3f2147ff89db6
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jan 2 15:41:38 2012 +0100

    Rebase to rhnsd-4.9.14-1.fc16 in rawhide.

 .gitignore |    1 +
 rhnsd.spec |   34 +++++++++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5791758..e4a9a70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ rhnsd-4.9.3.tar.gz
 /rhnsd-4.9.7.tar.gz
 /rhnsd-4.9.8.tar.gz
 /rhnsd-4.9.9.tar.gz
+/rhnsd-4.9.14.tar.gz
diff --git a/rhnsd.spec b/rhnsd.spec
index bf99b51..9c009f5 100644
--- a/rhnsd.spec
+++ b/rhnsd.spec
@@ -4,18 +4,24 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhnsd
-Version: 4.9.9
+Version: 4.9.14
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
 
 Requires: rhn-check >= 0.0.8
+%if 0%{?suse_version}
+Requires(post): aaa_base
+Requires(preun): aaa_base
+BuildRequires: sysconfig
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
 Requires(preun): initscripts
 Requires(postun): initscripts
+%endif
 
 %description
 The Red Hat Update Agent that automatically queries the Red Hat
@@ -23,14 +29,18 @@ Network servers and determines which packages need to be updated on
 your machine, and runs any actions.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
 make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}
+make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} INIT_DIR=$RPM_BUILD_ROOT/%{_initrddir}
+
+%if 0%{?suse_version}
+install -m 0755 rhnsd.init.SUSE $RPM_BUILD_ROOT/%{_initrddir}/rhnsd
+%endif
 
 %find_lang %{name}
 
@@ -56,6 +66,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files -f %{name}.lang 
 %defattr(-,root,root)
+%dir %{_sysconfdir}/sysconfig/rhn
 %config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
 %{_sbindir}/rhnsd
 %{_initrddir}/rhnsd
@@ -63,6 +74,23 @@ rm -fr $RPM_BUILD_ROOT
 %doc LICENSE
 
 %changelog
+* Wed Dec 21 2011 Milan Zazrivec <mzazrivec at redhat.com> 4.9.14-1
+- updated translations
+
+* Fri Jul 29 2011 Tomas Lestach <tlestach at redhat.com> 4.9.13-1
+- 679054 - fix random interval part (tlestach at redhat.com)
+
+* Tue Jul 19 2011 Jan Pazdziora 4.9.12-1
+- Merging Transifex changes for rhnsd.
+- New translations from Transifex for rhnsd.
+- Download translations from Transifex for rhnsd.
+
+* Tue Jul 19 2011 Jan Pazdziora 4.9.11-1
+- update .po and .pot files for rhnsd
+
+* Fri Apr 15 2011 Jan Pazdziora 4.9.10-1
+- changes to build rhnsd on SUSE (mc at suse.de)
+
 * Fri Feb 18 2011 Jan Pazdziora 4.9.9-1
 - l10n: Updates to Estonian (et) translation (mareklaane at fedoraproject.org)
 
diff --git a/sources b/sources
index 516b663..3198db3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c8d50d14d8e07c330a090266e0797b5  rhnsd-4.9.9.tar.gz
+92ede5bf8ad19187c81b7b76a38bc6c9  rhnsd-4.9.14.tar.gz


More information about the scm-commits mailing list