client/tools/rhncfg/rhncfg.spec | 35 ++++++++++++-----------------------
rel-eng/packages/rhncfg | 2 +-
2 files changed, 13 insertions(+), 24 deletions(-)
New commits:
commit bf7de64c50434cdcd307538f7d93343c4d0f2439
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:08:10 2009 +0100
Automatic commit of package [rhncfg] release [5.9.14-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 5bb438d..060011d 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.13
+Version: 5.9.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.14-1
+- 491088 - Polish the spec according Fedora Packaging Guidelines
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.13-1
- 491088 - Polish the spec according Fedora Packaging Guidelines
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 24acd70..955a72e 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.13-1 client/tools/rhncfg/
+5.9.14-1 client/tools/rhncfg/
commit 8198d7d12a139a2f3255806ef8d7db7db30ca4fa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:03:16 2009 +0100
491088 - droping virtual provides
This has been added by Misa in 2003 (rev. 71254) for no obvious reason.
It should not be used anywhere in current code. Dropping
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 98fcfe3..5bb438d 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -17,9 +17,6 @@ BuildRequires: python
Requires: libselinux-python
Requires: python
Requires: rhnlib
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
-Provides: rhn-config-management-package = %{version}
# If this is rhel 4 or less we need up2date.
%if 0%{?rhel} && "%rhel" < "5"
Requires: up2date
@@ -34,8 +31,6 @@ The base libraries and functions needed by all rhncfg-* packages.
Summary: Red Hat Network Configuration Client
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
%description client
A command line interface to the client features of the RHN Configuration
@@ -45,7 +40,6 @@ Management system.
Summary: Red Hat Network Configuration Management Client
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Provides: rhn-config-management-package = %{version}
%description management
A command line interface used to manage RHN configuration.
@@ -55,8 +49,6 @@ Summary: Red Hat Network Configuration Client Actions
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
%description actions
The code required to run configuration actions scheduled via the RHN website or
commit 27d4c7f671ef74c2f11b92bef6c7f7b564e3a66d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:46:41 2009 +0100
491088 - removing summary from description
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 10202f7..98fcfe3 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -28,7 +28,6 @@ Requires: rhn-client-tools
%endif
%description
-Red Hat Network Configuration Client Libraries.
The base libraries and functions needed by all rhncfg-* packages.
%package client
@@ -39,7 +38,6 @@ Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
%description client
-Red Hat Network Configuration Client.
A command line interface to the client features of the RHN Configuration
Management system.
@@ -50,7 +48,6 @@ Requires: %{name} = %{version}-%{release}
Provides: rhn-config-management-package = %{version}
%description management
-Red Hat Network Configuration Management Client.
A command line interface used to manage RHN configuration.
%package actions
@@ -62,7 +59,6 @@ Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
%description actions
-Red Hat Network Configuration Client Actions
The code required to run configuration actions scheduled via the RHN website or
RHN Satellite or Spacewalk.
commit 00c0edefb7cda6f9cacb2586f7e8465f78205f6e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:44:51 2009 +0100
491088 - move dependency on rhn-client-tools to base package
%{rhnroot} (i.e. %{_datadir}/rhn) is used in every package but rhn-client-tools
is only required in rhncfg-actions. This require should be moved up to the main
package.
%{rhnconf} (i.e. %_sysconfdir}/sysconfig/rhn) is used in the client and
management subpackages which is to be found in rhn-client-tools as well
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 402dc75..10202f7 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -20,6 +20,12 @@ Requires: rhnlib
Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
Provides: rhn-config-management-package = %{version}
+# If this is rhel 4 or less we need up2date.
+%if 0%{?rhel} && "%rhel" < "5"
+Requires: up2date
+%else
+Requires: rhn-client-tools
+%endif
%description
Red Hat Network Configuration Client Libraries.
@@ -52,14 +58,6 @@ Summary: Red Hat Network Configuration Client Actions
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-
-# If this is rhel 4 or less we need up2date.
-%if 0%{?rhel} && "%rhel" < "5"
-Requires: up2date
-%else
-Requires: rhn-client-tools
-%endif
-
Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
commit 766f94dc417124631fad5db2bc9373351813f4d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:40:21 2009 +0100
491088 - license is GPLv2 and Python
e.g. compile.py is based on
Python-licensed code
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 19b829e..402dc75 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -5,7 +5,7 @@
Name: rhncfg
Summary: Red Hat Network Configuration Client Libraries
Group: Applications/System
-License: GPLv2
+License: GPLv2 and Python
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
Version: 5.9.13
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{rhnroot}/config_common
-%doc LICENSE
+%doc LICENSE PYTHON-LICENSES.txt
%files client
%defattr(-,root,root,-)