[rhn-custom-info] Rebase to rhn-custom-info-5.4.7-1.fc14 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Mon Feb 7 09:13:10 UTC 2011


commit e7e0990d69e42d549cd4ac61c728a2e23b26c6bd
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Feb 7 10:12:55 2011 +0100

    Rebase to rhn-custom-info-5.4.7-1.fc14 in rawhide.

 .gitignore           |    1 +
 rhn-custom-info.spec |   18 ++++++++++++++----
 sources              |    2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a9decc..2387c56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rhn-custom-info-5.4.5.tar.gz
+/rhn-custom-info-5.4.7.tar.gz
diff --git a/rhn-custom-info.spec b/rhn-custom-info.spec
index 92e9ae4..da5a09c 100644
--- a/rhn-custom-info.spec
+++ b/rhn-custom-info.spec
@@ -4,11 +4,18 @@ Group: Applications/System
 License: GPLv2 and Python
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
-Version: 5.4.5
-Release: 3%{?dist}
+Version: 5.4.7
+Release: 1%{?dist}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: python-devel
+%if 0%{?fedora} == 13
+Requires: python-abi = 2.6
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 4
+BuildRequires: python
+Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
+%endif
 Requires: rhnlib
 
 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 1
@@ -46,8 +53,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/rhn-custom-info.*
 
 %changelog
-* Tue Nov 23 2010 Miroslav Suchý <msuchy at redhat.com> 5.4.5-3
-- remove explicit python-abi requirement
+* Wed Dec 08 2010 Michael Mraka <michael.mraka at redhat.com> 5.4.7-1
+- import Fault, ResponseError and ProtocolError directly from xmlrpclib
+
+* Thu Nov 25 2010 Miroslav Suchý <msuchy at redhat.com> 5.4.6-1
+- fix failing build in F13 (msuchy at redhat.com)
 
 * Fri Nov 19 2010 Miroslav Suchý <msuchy at redhat.com> 5.4.5-1
 - 553649 - we need to require X.Y version due to search path
diff --git a/sources b/sources
index cf18162..6f42422 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf93753ccdb641c33d339813f01ecb51  rhn-custom-info-5.4.5.tar.gz
+67602747583c202b030ab798a9310a6a  rhn-custom-info-5.4.7.tar.gz


More information about the scm-commits mailing list