Re: [Spacewalk-devel] [PATCH] build rhncfg on openSUSE

2011-04-15 Thread Michael Calmer
Hi,

Am Freitag, 8. April 2011, 14:57:56 schrieb Michael Calmer:
 Hi,
 
 here is the patch for rhncfg.
 
 0007-build-rhncfg-on-SUSE.patch:
 - only some specfile modifications

I splitted this into seperate patches. One SUSE specific and one general one
like you suggested. 

-- 
Regards,

Michael Calmer

--
Michael Calmer
SUSE LINUX Products GmbH, Maxfeldstr. 5, D-90409 Nuernberg
T: +49 (0) 911 74053 0
F: +49 (0) 911 74053575  - e-mail: michael.cal...@suse.com
--
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
From b31b81520f06693b299f962eb20bec4c4bd7d01a Mon Sep 17 00:00:00 2001
From: Michael Calmer m...@suse.de
Date: Thu, 14 Apr 2011 18:13:25 +0200
Subject: [PATCH 05/13] build rhncfg build on SUSE

- provide on SUSE missing directories
---
 client/tools/rhncfg/rhncfg.spec |8 
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 43384e6..f760038 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -17,7 +17,12 @@ BuildRequires: python
 Requires: python
 Requires: rhnlib = 2.5.32
 Requires: rhn-client-tools
+%if 0%{?suse_version}
+# provide rhn directories and no selinux on suse
+BuildRequires: rhn-client-tools
+%else
 Requires: libselinux-python
+%endif
 
 %description 
 The base libraries and functions needed by all rhncfg-* packages.
@@ -68,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%if 0%{?suse_version}
+%dir %{_sharedstatedir}
+%endif
 %{rhnroot}/config_common
 %{_sharedstatedir}/rhncfg/backups
 %doc LICENSE PYTHON-LICENSES.txt
-- 
1.7.3.4

From 73cb7d7a4d15ddf533d537f3ec3bcfe016a88d3d Mon Sep 17 00:00:00 2001
From: Michael Calmer m...@suse.de
Date: Thu, 14 Apr 2011 18:24:47 +0200
Subject: [PATCH 06/13] add missing directories to filelist

---
 client/tools/rhncfg/rhncfg.spec |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index f760038..0d55a8b 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?suse_version}
 %dir %{_sharedstatedir}
 %endif
+%dir %{_sharedstatedir}/rhncfg
 %{rhnroot}/config_common
 %{_sharedstatedir}/rhncfg/backups
 %doc LICENSE PYTHON-LICENSES.txt
@@ -96,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files actions
 %defattr(-,root,root,-)
-%{rhnroot}/actions/*
+%{rhnroot}/actions
 %{_bindir}/rhn-actions-control
 %config(noreplace) %{client_caps_dir}/*
 %{_mandir}/man8/rhn-actions-control.8*
-- 
1.7.3.4

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Re: [Spacewalk-devel] [PATCH] build rhncfg on openSUSE

2011-04-15 Thread Jan Pazdziora
On Fri, Apr 15, 2011 at 01:38:21PM +0200, Michael Calmer wrote:
 Hi,
 
 Am Freitag, 8. April 2011, 14:57:56 schrieb Michael Calmer:
  Hi,
  
  here is the patch for rhncfg.
  
  0007-build-rhncfg-on-SUSE.patch:
  - only some specfile modifications
 
 I splitted this into seperate patches. One SUSE specific and one general one
 like you suggested. 

Pushed to master as dae10073c35f9cbba7d1160014788316c56c37aa
and baf0e0467eb5d6c924532399537a02b3ad26cf4a
and tagged as rhncfg-5.10.2-1

Thanks,

-- 
Jan Pazdziora
Principal Software Engineer, Satellite Engineering, Red Hat

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel


Re: [Spacewalk-devel] [PATCH] build rhncfg on openSUSE

2011-04-11 Thread Miroslav Suchý
On 04/08/2011 02:57 PM, Michael Calmer wrote:
 Hi,
 
 here is the patch for rhncfg.
 
 0007-build-rhncfg-on-SUSE.patch:
 - only some specfile modifications

If I put aside the fact that I would prefer more commits about this
splitting things which allow build rhncfg on SUSE like:
+%if 0%{?rhel}
 Requires: libselinux-python
 %endif
+%endif
from general fixes, like:
+%dir %{_sharedstatedir}/rhncfg

Then I have problem with:
+%dir %{_sharedstatedir}
This is owned by filesystem package on Fedora. If this is not owned by
any base package on SUSE wrap it with if/endif

+%dir %{rhnconf}
This should not be there. This directory is owned by rhn-client-tools
and we Require it.

+%dir %{client_caps_dir}
This is the same. This directory is owned by rhn-client-tools and we
Require it.

-- 
Miroslav Suchy
Red Hat Satellite Engineering

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel