[rhncfg] Rebase to rhncfg-5.10.36-1.fc17 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Fri Nov 2 10:33:27 UTC 2012


commit 2b0b3d20982ea80b45f935698aa92844468c3084
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Nov 2 11:33:20 2012 +0100

    Rebase to rhncfg-5.10.36-1.fc17 in rawhide.

 .gitignore  |    1 +
 rhncfg.spec |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 sources     |    2 +-
 3 files changed, 47 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00e8104..34f29bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ rhncfg-5.9.22.tar.gz
 /rhncfg-5.9.52.tar.gz
 /rhncfg-5.10.24.tar.gz
 /rhncfg-5.10.27.tar.gz
+/rhncfg-5.10.36.tar.gz
diff --git a/rhncfg.spec b/rhncfg.spec
index 0e068e6..a3444cc 100644
--- a/rhncfg.spec
+++ b/rhncfg.spec
@@ -8,14 +8,14 @@ Group:   Applications/System
 License: GPLv2
 URL:     https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.27
-Release: 2%{?dist}
+Version: 5.10.36
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: docbook-utils
 BuildRequires: python
 Requires: python
-Requires: rhnlib >= 2.5.32
+Requires: rhnlib
 Requires: rhn-client-tools
 %if 0%{?suse_version}
 # provide rhn directories and no selinux on suse
@@ -68,12 +68,20 @@ make -f Makefile.rhncfg install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
     MANDIR=%{_mandir}
 mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/rhncfg/backups
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/spool/rhn
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log
+touch $RPM_BUILD_ROOT/%{_localstatedir}/log/rhncfg-actions
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f %{_localstatedir}/log/rhncfg-actions ]
+then 
+chown root %{_localstatedir}/log/rhncfg-actions
+chmod 600 %{_localstatedir}/log/rhncfg-actions
+fi
+
 %files
-%defattr(-,root,root,-)
 %if 0%{?suse_version}
 %dir %{_sharedstatedir}
 %endif
@@ -84,30 +92,58 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 
 %files client
-%defattr(-,root,root,-)
 %{rhnroot}/config_client
 %{_bindir}/rhncfg-client
 %attr(644,root,root) %config(noreplace) %{rhnconf}/rhncfg-client.conf
 %{_mandir}/man8/rhncfg-client.8*
 
 %files management
-%defattr(-,root,root,-)
 %{rhnroot}/config_management
 %{_bindir}/rhncfg-manager
 %attr(644,root,root) %config(noreplace) %{rhnconf}/rhncfg-manager.conf
 %{_mandir}/man8/rhncfg-manager.8*
 
 %files actions
-%defattr(-,root,root,-)
 %{rhnroot}/actions
 %{_bindir}/rhn-actions-control
 %config(noreplace) %{client_caps_dir}/*
 %{_mandir}/man8/rhn-actions-control.8*
+%ghost %attr(600,root,root) %{_localstatedir}/log/rhncfg-actions
 
 # $Id$
 %changelog
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Tue Oct 30 2012 Jan Pazdziora 5.10.36-1
+- Update the copyright year.
+- fix for bz#869626 use st_mode, st_uid of dst Signed-off-by: Paresh Mutha
+  <pmutha at redhat.com>
+
+* Mon Oct 22 2012 Jan Pazdziora 5.10.35-1
+- Revert "Revert "Revert "get_server_capability() is defined twice in osad and
+  rhncfg, merge and move to rhnlib and make it member of rpclib.Server"""
+
+* Tue Aug 07 2012 Tomas Kasparek <tkasparek at redhat.com> 5.10.34-1
+- 840250 - If there's symlink in file deployment path it will be created
+
+* Mon Jul 09 2012 Michael Mraka <michael.mraka at redhat.com> 5.10.33-1
+- check symlink not target file existence
+
+* Thu Jun 28 2012 Michael Mraka <michael.mraka at redhat.com> 5.10.32-1
+- 765816 - value of selinux context is important
+
+* Mon Jun 04 2012 Stephen Herr <sherr at redhat.com> 5.10.31-1
+- 824707 - make /var/log/rhncfg-actions have 600 permissions
+
+* Fri Jun 01 2012 Stephen Herr <sherr at redhat.com> 5.10.30-1
+- 824707 - rhncfg-actions should not log the diff of files that are not
+  readable by all
+- %%defattr is not needed since rpm 4.4
+
+* Mon May 14 2012 Michael Mraka <michael.mraka at redhat.com> 5.10.29-1
+- 820517 - fixed command synopsis
+- 805449 - honor rhncfg-specific settings
+
+* Thu Mar 08 2012 Miroslav Suchý 5.10.28-1
+- accept server name without protocol
 
 * Fri Mar 02 2012 Jan Pazdziora 5.10.27-1
 - Update the copyright year info.
diff --git a/sources b/sources
index b0b7698..9f5ca8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d3fdd0f8803f4f66eb9694a200c86aa  rhncfg-5.10.27.tar.gz
+4b90910695a87e09769ef7689a8764ce  rhncfg-5.10.36.tar.gz


More information about the scm-commits mailing list