[rhn-client-tools] Rebase to rhn-client-tools-1.6.46-1.fc16 in rawhide.
Miroslav Suchý
msuchy at fedoraproject.org
Mon Jan 2 14:40:29 UTC 2012
commit b07039bac1b362d754f4db42240d56cc714bfb24
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Mon Jan 2 15:40:22 2012 +0100
Rebase to rhn-client-tools-1.6.46-1.fc16 in rawhide.
.gitignore | 1 +
rhn-client-tools.spec | 311 +++++++++++++++++++++++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 292 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5782730..700eba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ rhn-client-tools-1.1.6.tar.gz
/rhn-client-tools-1.2.15.tar.gz
/rhn-client-tools-1.3.12.tar.gz
/rhn-client-tools-1.4.16.tar.gz
+/rhn-client-tools-1.6.46.tar.gz
diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec
index 1453309..0291ebe 100644
--- a/rhn-client-tools.spec
+++ b/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.4.16
+Version: 1.6.46
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -12,30 +12,38 @@ BuildArch: noarch
BuildRequires: update-desktop-files
%endif
-Requires: rhnlib >= 2.5.38
+Requires: rhnlib >= 2.5.41
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Requires: python-ethtool
-%else
Requires: python-ethtool >= 0.4
-%endif
Requires: gnupg
Requires: sh-utils
+%if 0%{?suse_version}
+Requires: dbus-1-python
+%else
Requires: dbus-python
-%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+%endif
+%if 0%{?fedora} || 0%{?rhel} > 5
Requires: python-gudev
Requires: python-hwdata
%else
Requires: hal >= 0.5.8.1-52
%endif
+%if 0%{?suse_version}
+Requires: python-newt
+%else
Requires: newt
+%endif
Requires: python-dmidecode
Requires: libxml2-python
+%if 0%{?suse_version}
+Requires: zypper
+%else
Requires: yum
+%endif
Conflicts: up2date < 5.0.0
-Conflicts: yum-rhn-plugin < 1.1.4-1
+Conflicts: yum-rhn-plugin < 1.6.4-1
Conflicts: rhncfg < 5.9.23-1
Conflicts: spacewalk-koan < 0.2.7-1
Conflicts: rhn-kickstart < 5.4.3-1
@@ -49,12 +57,12 @@ BuildRequires: desktop-file-utils
%if 0%{?fedora}
BuildRequires: fedora-logos
%endif
-%if 0%{?rhel} > 4
+%if 0%{?rhel}
BuildRequires: redhat-logos
%endif
# The following BuildRequires are for check only
-%if 0%{?fedora} >= 12
+%if 0%{?fedora}
BuildRequires: python-coverage
BuildRequires: rhnlib
BuildRequires: rpm-python
@@ -68,7 +76,11 @@ system to receive software updates from Red Hat Network or Spacewalk.
Summary: Check for RHN actions
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
-Requires: yum-rhn-plugin >= 1.1.2-1
+%if 0%{?suse_version}
+Requires: zypp-plugin-spacewalk
+%else
+Requires: yum-rhn-plugin >= 1.6.4-1
+%endif
%description -n rhn-check
rhn-check polls a Red Hat Network or Spacewalk server to find and execute
@@ -92,12 +104,14 @@ Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: rhn-setup = %{version}-%{release}
Requires: pam >= 0.72
+%if 0%{?suse_version}
+Requires: python-gnome python-gtk
+%else
Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas
+%endif
Requires: usermode-gtk
-%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
Requires: gnome-python2-gnome gnome-python2-bonobo
-%endif
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: liberation-sans-fonts
%endif
@@ -120,7 +134,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
-%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
%else
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
@@ -135,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn rhn_register.desktop
%if 0%{?suse_version}
-%suse_update_desktop_file rhn_register System
+%suse_update_desktop_file -r rhn_register "Settings;System;SystemSetup;"
%endif
%find_lang %{name}
@@ -159,7 +173,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} >= 12
+%if 0%{?fedora}
%check
make -f Makefile.rhn-client-tools test
@@ -179,7 +193,7 @@ make -f Makefile.rhn-client-tools test
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/configfiles
%dir %{_sysconfdir}/sysconfig/rhn/allowed-actions/script
-%config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
+%verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/sysconfig/rhn/up2date
%config(noreplace) %{_sysconfdir}/logrotate.d/up2date
%config(noreplace) %{_sysconfdir}/rpm/macros.up2date
@@ -231,7 +245,6 @@ make -f Makefile.rhn-client-tools test
# actions for rhn_check to run
%{_datadir}/rhn/actions/__init__.*
%{_datadir}/rhn/actions/hardware.*
-%{_datadir}/rhn/actions/errata.*
%{_datadir}/rhn/actions/systemid.*
%{_datadir}/rhn/actions/reboot.*
%{_datadir}/rhn/actions/rhnsd.*
@@ -260,6 +273,13 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/setuptool/setuptool.d/99rhn_register
+%if 0%{?suse_version}
+# on SUSE directories not owned by any package
+%dir %{_sysconfdir}/security/console.apps
+%dir %{_datadir}/setuptool
+%dir %{_datadir}/setuptool/setuptool.d
+%endif
+
%files -n rhn-setup-gnome
%defattr(-,root,root,-)
%{_datadir}/rhn/up2date_client/messageWindow.*
@@ -296,9 +316,258 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/firstboot/rhn_finish_gui.*
%endif
+%if 0%{?suse_version}
+# on SUSE these directories are part of packages not installed
+# at buildtime. OBS failed with not owned by any package
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/16x16
+%dir %{_datadir}/icons/hicolor/16x16/apps
+%dir %{_datadir}/icons/hicolor/24x24
+%dir %{_datadir}/icons/hicolor/24x24/apps
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+%dir %{_datadir}/icons/hicolor/48x48
+%dir %{_datadir}/icons/hicolor/48x48/apps
+%dir %{_datadir}/rhn/up2date_client/firstboot
+%dir %{_datadir}/firstboot
+%dir %{_datadir}/firstboot/modules
+%endif
+
%changelog
-* Wed Apr 13 2011 Miroslav Suchý 1.4.16-1
-- fix typo in key "product" vs. "PRODUCT"
+* Wed Dec 21 2011 Milan Zazrivec <mzazrivec at redhat.com> 1.6.46-1
+- update copyright info
+- 751760 - use __getattr__ rather then __getattribute__ (msuchy at redhat.com)
+
+* Wed Dec 21 2011 Milan Zazrivec <mzazrivec at redhat.com> 1.6.45-1
+- updated translations
+
+* Tue Dec 20 2011 Miroslav Suchý 1.6.44-1
+- 744111 - notify subscription-manager to recheck compliance status
+
+* Fri Dec 16 2011 Jan Pazdziora 1.6.43-1
+- Revert "always return RPC data in plain string (utf-8 encoded)"
+
+* Tue Dec 13 2011 Jan Pazdziora 1.6.42-1
+- Fixing typo.
+
+* Mon Dec 12 2011 Jan Pazdziora 1.6.41-1
+- 703833 - if /sbin/service is not available, try to use /usr/sbin/service.
+
+* Fri Dec 09 2011 Miroslav Suchý 1.6.40-1
+- 569790 - for scope on rhel5 do s/global/universe/
+
+* Fri Dec 02 2011 Miroslav Suchý 1.6.39-1
+- IPv6: first try findHostByRoute() and then try getaddrinfo()
+- IPv6: assign to hostname only if we are unable to resolve it
+- IPv6: IPv4 is most probably set up better, lets overwrite IPv6 values (if
+ mismatch)
+- 743259 - take hostname of client instead of server
+
+* Tue Nov 29 2011 Miroslav Suchý 1.6.38-1
+- define __init__, __getattribute__, __setattr__ on Debian and workaround those
+ mising methods on RHEL5
+
+* Thu Nov 24 2011 Jan Pazdziora 1.6.37-1
+- 735346 - add space after do_call in cases like
+ do_callpackages.checkNeedUpdate(rhnsd=1,){}.
+
+* Mon Nov 21 2011 Miroslav Suchý 1.6.36-1
+- 751760 - make errmsg as an alias to value (for setter too)
+
+* Mon Nov 21 2011 Miroslav Suchý 1.6.35-1
+- 751760 - make errmsg as an alias to value
+
+* Mon Nov 07 2011 Miroslav Suchý 1.6.34-1
+- call parent's constructor
+- 751760 - use attribute value, which our ancestor use
+- correctly assign converted unicode string
+- correctly check for unicode type
+
+* Thu Nov 03 2011 Miroslav Suchý 1.6.33-1
+- 595837 - add missing import
+
+* Wed Nov 02 2011 Miroslav Suchý 1.6.32-1
+- 595837 - all up2date bugs now inherit from YumBaseError so yum/pup can catch
+ them
+
+* Tue Nov 01 2011 Miroslav Suchý 1.6.31-1
+- 595837 - properly handle two exceptions (msuchy at redhat.com)
+
+* Tue Nov 01 2011 Tomas Lestach <tlestach at redhat.com> 1.6.30-1
+- 706148 - fix setting uri (luvilla at redhat.com)
+
+* Mon Oct 31 2011 Miroslav Suchý 1.6.29-1
+- 743259 - initialize variable before use
+
+* Fri Oct 28 2011 Jan Pazdziora 1.6.28-1
+- add missing import (mzazrivec at redhat.com)
+
+* Fri Oct 21 2011 Jan Pazdziora 1.6.27-1
+- Pass the verbose option (-vv) from rhnreg_ks to rhn_check as well.
+
+* Fri Oct 21 2011 Miroslav Suchý 1.6.26-1
+- 627809 - send xen virtual block devices to rhnParent
+- Revert "729161 - default to RHSM in firstboot registration"
+ (mzazrivec at redhat.com)
+
+* Wed Oct 19 2011 Miroslav Suchý 1.6.25-1
+- 743259 - RHEL5 now has python-ethtool 0.6 - simplify code
+- 743259 - get_ipv6_addresses does not return one item, but list
+- 745438 - up2date_config: use localhost to avoid confusion
+ (mzazrivec at redhat.com)
+
+* Tue Oct 18 2011 Miroslav Suchý 1.6.24-1
+- move errata.py action to the yum-rhn-plugin package (iartarisi at suse.cz)
+
+* Tue Oct 11 2011 Tomas Lestach <tlestach at redhat.com> 1.6.23-1
+- 706148 - set _uri, when connecting to a different server (luvilla at redhat.com)
+
+* Fri Oct 07 2011 Miroslav Suchý 1.6.22-1
+- 743259 - if IPv6 is not present, send empty string instead of None
+
+* Thu Oct 06 2011 Miroslav Suchý 1.6.21-1
+- 743259 - send IPv6 addresses only if server support it
+
+* Thu Oct 06 2011 Miroslav Suchý 1.6.20-1
+- 743259 - really send ipv6 address
+
+* Tue Oct 04 2011 Miroslav Suchý 1.6.19-1
+- 743259 - support for IPv6
+
+* Mon Oct 03 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.18-1
+- require rhnlib with IDN stuff
+
+* Mon Sep 19 2011 Martin Minar <mminar at redhat.com> 1.6.17-1
+- 688072 - polish registration welcome message a bit (mzazrivec at redhat.com)
+
+* Fri Sep 09 2011 Jan Pazdziora 1.6.16-1
+- 576223 - make rhn-profile-sync write errors to stderr.
+
+* Wed Aug 24 2011 Martin Minar <mminar at redhat.com> 1.6.15-1
+- Revert "727908 - registration: send correct hostname during kickstart"
+ (mzazrivec at redhat.com)
+
+* Wed Aug 17 2011 Martin Minar <mminar at redhat.com> 1.6.14-1
+- 729468 - TUI: polish registration messages (mzazrivec at redhat.com)
+
+* Fri Aug 12 2011 Miroslav Suchý 1.6.13-1
+- do not verify md5, size and mtime for /etc/sysconfig/rhn/up2date
+
+* Thu Aug 11 2011 Jan Pazdziora 1.6.12-1
+- 729161 - default to RHSM in firstboot registration (mzazrivec at redhat.com)
+- 729468 - firstboot dialogs polishing (mzazrivec at redhat.com)
+
+* Thu Aug 11 2011 Miroslav Suchý 1.6.11-1
+- do not mask original error by raise in execption
+
+* Thu Aug 11 2011 Martin Minar <mminar at redhat.com> 1.6.10-1
+- 702084 - always print trailing newline for error messages
+ (mzazrivec at redhat.com)
+
+* Wed Aug 10 2011 Martin Minar <mminar at redhat.com> 1.6.9-1
+- 684913 - fix SSLCertificateVerifyFailedError exception message
+ (mzazrivec at redhat.com)
+
+* Fri Aug 05 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.8-1
+- convert args to string first
+
+* Thu Aug 04 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.7-1
+- the latest yum-rhn-plugin and rhn-client-tools require each other
+
+* Thu Aug 04 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.6-1
+- 710065 - handle unicode log messages
+- 710065 - handle unicode error messages
+- merged duplicated code to NoLogError class
+- moved duplicated code to base Error class
+- 684250 - correct priority for initial registration screen
+
+* Thu Aug 04 2011 Martin Minar <mminar at redhat.com> 1.6.5-1
+- 727908 - registration: send correct hostname during kickstart
+ (mzazrivec at redhat.com)
+
+* Wed Aug 03 2011 Martin Minar <mminar at redhat.com> 1.6.4-1
+- 702107 - cogent error message for exception when listing child channels
+ (mzazrivec at redhat.com)
+
+* Tue Aug 02 2011 Martin Minar <mminar at redhat.com> 1.6.3-1
+- 702084 - rhn-channel: meaningful message when wrong username / password
+ (mzazrivec at redhat.com)
+
+* Thu Jul 28 2011 Jan Pazdziora 1.6.2-1
+- 713548 - enable running rhn-channel on RHEL5 (tlestach at redhat.com)
+- 713548 - enable running rhn-channel against both RHN and RHN Satellite
+ (tlestach at redhat.com)
+
+* Fri Jul 22 2011 Jan Pazdziora 1.6.1-1
+- The rhn-client-tools/doc/releases.txt is out of date, removing.
+- We only support version 5 and newer of RHEL, removing conditions for old
+ versions.
+- We only support version 14 and newer of Fedora, removing conditions for old
+ versions.
+
+* Tue Jul 19 2011 Jan Pazdziora 1.5.16-1
+- Merging Transifex changes for rhn-client-tools.
+- Fixing the `msgid' and `msgstr' entries do not both end with '\n' bug.
+- Download translations from Transifex for rhn-client-tools.
+
+* Tue Jul 19 2011 Jan Pazdziora 1.5.15-1
+- update .po and .pot files for rhn-client-tools
+
+* Tue Jun 21 2011 Jan Pazdziora 1.5.14-1
+- 714113 - handle writing unicode to log file (msuchy at redhat.com)
+
+* Wed Jun 15 2011 Miroslav Suchý 1.5.13-1
+- forward port translation from RHEL6 (msuchy at redhat.com)
+- forward port translation from RHEL5 (msuchy at redhat.com)
+
+* Wed Jun 15 2011 Jan Pazdziora 1.5.12-1
+- forward port translation from RHEL5 (msuchy at redhat.com)
+
+* Tue Jun 14 2011 Miroslav Suchý 1.5.11-1
+- forward port translation from RHEL5 (msuchy at redhat.com)
+- forward port translation from RHEL5 (msuchy at redhat.com)
+- add missing \n and hyperlink to zh_TW (msuchy at redhat.com)
+- add missing \n and hyperlink to zh_CN (msuchy at redhat.com)
+- fix typo in te.po (msuchy at redhat.com)
+
+* Mon Jun 13 2011 Jan Pazdziora 1.5.10-1
+- forward port translation from RHEL5 (msuchy at redhat.com)
+- Download translations from Transifex for rhn-client-tools (msuchy at redhat.com)
+
+* Tue May 31 2011 Jan Pazdziora 1.5.9-1
+- fix typo (msuchy at redhat.com)
+
+* Mon May 23 2011 Miroslav Suchý 1.5.8-1
+- 683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works
+ and is idempotent (msuchy at redhat.com)
+- 683200 - if I want url in unicode, I must us decode - remember that
+ (msuchy at redhat.com)
+
+* Thu Apr 28 2011 Simon Lukasik <slukasik at redhat.com> 1.5.7-1
+- The Debian client on x86_64 should send amd64-debian-linux
+ (slukasik at redhat.com)
+
+* Sun Apr 17 2011 Simon Lukasik <slukasik at redhat.com> 1.5.6-1
+- Codename might not be always present within lsb_release on Debian
+ (slukasik at redhat.com)
+
+* Sat Apr 16 2011 Simon Lukasik <slukasik at redhat.com> 1.5.5-1
+- Do not import yum on Debian platform (slukasik at redhat.com)
+
+* Fri Apr 15 2011 Jan Pazdziora 1.5.3-1
+- modify spec file to build rhn-client-tools on SUSE (mc at suse.de)
+- get model id from PRODUCT key (msuchy at redhat.com)
+- <type exceptions.UnboundLocalError>: local variable usb referenced before
+ assignment (msuchy at redhat.com)
+
+* Wed Apr 13 2011 Jan Pazdziora 1.5.2-1
+- Revert "some usb device may not return product" (msuchy at redhat.com)
+- fix typo in key "product" vs. "PRODUCT" (msuchy at redhat.com)
+- some usb device may not return product (msuchy at redhat.com)
+
+* Tue Apr 12 2011 Miroslav Suchý 1.5.1-1
+- enhance getOSVersionAndRelease to find SUSE distributions (mc at suse.de)
+- Bumping package versions for 1.5 (msuchy at redhat.com)
* Fri Apr 08 2011 Miroslav Suchý 1.4.15-1
- fix fr translation (msuchy at redhat.com)
diff --git a/sources b/sources
index 3e72d62..4640106 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8768feda4763042453fbb8d6e9bd570a rhn-client-tools-1.4.16.tar.gz
+06960668476f94712f798071dd61ca04 rhn-client-tools-1.6.46.tar.gz
More information about the scm-commits
mailing list