[rhn-client-tools] Rebase to rhn-client-tools-1.1.15-1.el6 in rawhide.
Miroslav Suchý
msuchy at fedoraproject.org
Fri Aug 13 16:31:42 UTC 2010
commit 4dc817d7fa6510599c4d855b6c507db307074454
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Fri Aug 13 18:31:40 2010 +0200
Rebase to rhn-client-tools-1.1.15-1.el6 in rawhide.
.gitignore | 1 +
rhn-client-tools.spec | 210 ++++++++++++++++++++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 193 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58d4fb7..933fc19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
rhn-client-tools-1.1.6.tar.gz
+/rhn-client-tools-1.1.15.tar.gz
diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec
index cfc0c8b..ea29354 100644
--- a/rhn-client-tools.spec
+++ b/rhn-client-tools.spec
@@ -4,8 +4,8 @@ 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.1.6
-Release: 2%{?dist}
+Version: 1.1.15
+Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if 0%{?suse_version}
@@ -21,7 +21,7 @@ Requires: sh-utils
Requires: dbus-python
%if 0%{?fedora} > 12 || 0%{?rhel} > 5
Requires: python-gudev
-Requires: hwdata
+Requires: python-hwdata
%else
Requires: hal >= 0.5.8.1-52
%endif
@@ -36,12 +36,17 @@ BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
+BuildRequires: fedora-logos
+%endif
+%if 0%{?rhel} > 4
+BuildRequires: redhat-logos
+%endif
+
# The following BuildRequires are for check only
%if 0%{?fedora} >= 12
BuildRequires: python-coverage
BuildRequires: rhnlib
-# python-setuptools can be removed when 556290 gets fixed
-BuildRequires: python-setuptools
BuildRequires: rpm-python
%endif
@@ -77,8 +82,14 @@ Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: rhn-setup = %{version}-%{release}
Requires: pam >= 0.72
-Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas
+Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas
Requires: usermode-gtk
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+Requires: gnome-python2-gnome gnome-python2-bonobo
+%endif
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: liberation-sans-fonts
+%endif
%description -n rhn-setup-gnome
rhn-setup-gnome contains a GTK+ graphical interface for configuring and
@@ -99,6 +110,19 @@ 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
+rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
+%else
+rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
+%endif
+
+%if 0%{?rhel} > 0 && 0%{?rhel} < 6
+rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/firstboot
+rm -f $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_register.*
+%else
+rm -rf $RPM_BUILD_ROOT%{_datadir}/firstboot/modules/rhn_*_*.*
+%endif
+
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
@@ -134,7 +158,6 @@ make -f Makefile.rhn-client-tools test
%files -f %{name}.lang
%defattr(-,root,root,-)
# some info about mirrors
-%doc doc/ChangeLog
%doc doc/mirrors.txt
%doc doc/AUTHORS
%doc doc/LICENSE
@@ -206,6 +229,7 @@ make -f Makefile.rhn-client-tools test
%{_mandir}/man8/rhnreg_ks.8*
%{_mandir}/man8/rhn_register.8*
%{_mandir}/man8/spacewalk-channel.8*
+%{_mandir}/man8/rhn-channel.8*
%config(noreplace) %{_sysconfdir}/security/console.apps/rhn_register
%config(noreplace) %{_sysconfdir}/pam.d/rhn_register
@@ -220,16 +244,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/tui.*
%{_datadir}/rhn/up2date_client/rhnreg_constants.*
-# firstboot is smart enough now to skip these modules
-# if the modules say to
-%{_datadir}/firstboot/modules/rhn_login_gui.*
-%{_datadir}/firstboot/modules/rhn_register_firstboot_gui_window.*
-%{_datadir}/firstboot/modules/rhn_start_gui.*
-%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
-%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
-%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
-%{_datadir}/firstboot/modules/rhn_review_gui.*
-%{_datadir}/firstboot/modules/rhn_finish_gui.*
+%{_datadir}/setuptool/setuptool.d/99rhn_register
%files -n rhn-setup-gnome
%defattr(-,root,root,-)
@@ -245,9 +260,166 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/icons/hicolor/48x48/apps/up2date.png
%{_datadir}/applications/rhn_register.desktop
+%if 0%{?rhel} > 0 && 0%{?rhel} < 6
+%{_datadir}/firstboot/modules/rhn_login_gui.*
+%{_datadir}/firstboot/modules/rhn_register_firstboot_gui_window.*
+%{_datadir}/firstboot/modules/rhn_start_gui.*
+%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
+%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
+%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
+%{_datadir}/firstboot/modules/rhn_review_gui.*
+%{_datadir}/firstboot/modules/rhn_finish_gui.*
+%else
+%{_datadir}/firstboot/modules/rhn_register.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_login_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_start_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_choose_server_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_provide_certificate_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_create_profile_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_review_gui.*
+%{_datadir}/rhn/up2date_client/firstboot/rhn_finish_gui.*
+%endif
+
%changelog
-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.1.6-2
-- recompiling .py files against Python 2.7 (rhbz#623353)
+* Tue Aug 10 2010 Milan Zazrivec <mzazrivec at redhat.com> 1.1.15-1
+- update .po and .pot files for rhn-client-tools (msuchy at redhat.com)
+
+* Thu Aug 05 2010 Milan Zazrivec <mzazrivec at redhat.com> 1.1.14-1
+- 618267 - all data in F12+ should be in unicode, lets decode it
+- 619098 - take manufacturer from system group
+- 618267 - add missing import and foo
+- update .po files
+- Revert "update .po files"
+- 618267 - encode latin-1 characters to unicode
+- 617425 - add missing 'the's
+- 617425 - point the user to the correct menu item
+- add man page for rhn-channel as alias for spacewalk-channel
+- default for kwargs should be {}
+- update .po files
+- 616371 - typo fix
+- add parameter cache_only to up2date_config.* actions
+- enable caching for action errata.update
+
+* Tue Jul 20 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.13-1
+- add parameter cache_only to all client actions (msuchy at redhat.com)
+- simplify code (msuchy at redhat.com)
+- put parser of action xml to separate function (msuchy at redhat.com)
+- l10n: Updates to Italian (it) translation (fvalen at fedoraproject.org)
+
+* Mon Jul 19 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.12-1
+- we want to pre-cache if server *has* staging ability (msuchy at redhat.com)
+- use correct rhnserver class (msuchy at redhat.com)
+- l10n: Updates to Swedish (sv) translation (goeran at fedoraproject.org)
+
+* Thu Jul 15 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.11-1
+- 614389 - add missing import (msuchy at redhat.com)
+- basic framework for prefetching content from spacewalk (msuchy at redhat.com)
+
+* Fri Jul 09 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.10-1
+- 604106 - finish page should be loaded even without network
+ (msuchy at redhat.com)
+- 612547 - update copyright clauses up until 2010. (jpazdziora at redhat.com)
+- 607599 - prevent firstboot from show_all()-ing what we have hidden.
+ (jpazdziora at redhat.com)
+
+* Thu Jul 01 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.9-1
+- Clean up a few remaining references to kbase 6227
+ (joshua.roys at gtri.gatech.edu)
+- 604101 - kbase article 6227 changed name & location (mzazrivec at redhat.com)
+
+* Fri Jun 18 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.8-1
+- fix syntax error (msuchy at redhat.com)
+
+* Thu Jun 17 2010 Miroslav Suchý <msuchy at redhat.com> 1.1.7-1
+- l10n: Updates to Chinese (China) (zh_CN) translation
+ (leahliu at fedoraproject.org)
+- 601683 - properly import get_computer_info routine (mzazrivec at redhat.com)
+- 596237 - use correct constant in HardwareWindow (tui) (mzazrivec at redhat.com)
+- 596237 - use constants in SendingWindow (mzazrivec at redhat.com)
+- 596237 - use constants in SendWindow (mzazrivec at redhat.com)
+- 596237 - use constants in PackagesWindow (mzazrivec at redhat.com)
+- 596237 - use constants in HardwareWindow (mzazrivec at redhat.com)
+- 596237 - use constants in OSReleaseWindow & AlreadyRegisteredWindow
+ (mzazrivec at redhat.com)
+- l10n: Updates to Russian (ru) translation (ypoyarko at fedoraproject.org)
+- 600316 - don't traceback for zero subscribed channels (mzazrivec at redhat.com)
+- l10n: Updates to Russian (ru) translation (ypoyarko at fedoraproject.org)
+- l10n: Updates to Russian (ru) translation (ypoyarko at fedoraproject.org)
+- l10n: Updates to Russian (ru) translation (ypoyarko at fedoraproject.org)
+- l10n: Updates to Spanish (Castilian) (es) translation
+ (gguerrer at fedoraproject.org)
+- 598890 - always return product version as string (mzazrivec at redhat.com)
+- l10n: Updates to Spanish (Castilian) (es) translation
+ (gguerrer at fedoraproject.org)
+- Remove three more exceptions that are not used in our code base.
+ (jpazdziora at redhat.com)
+- The rhn-client-tools ChangeLog has't been updated since 2002, removing.
+ (jpazdziora at redhat.com)
+- Removing WarningDialog, OkDialog, and QuestionDialog that are not used in our
+ code. (jpazdziora at redhat.com)
+- Remove 23 exceptions that are not used in our code base.
+ (jpazdziora at redhat.com)
+- Method resetServerList not used in our code, removing.
+ (jpazdziora at redhat.com)
+- When startRhnCheck was replaced by spawnRhnCheckForUI, it became unused,
+ removing. (jpazdziora at redhat.com)
+- Method getFailedSystemSlots not used in our code, removing.
+ (jpazdziora at redhat.com)
+- get_device_property not used in our code, removing. (jpazdziora at redhat.com)
+- termsAndConditions not used in our code, removing. (jpazdziora at redhat.com)
+- sat_supports_virt_guest_registration not used in our code, removing.
+ (jpazdziora at redhat.com)
+- finishMessage not used in our code, removing. (jpazdziora at redhat.com)
+- When autoActivateNumbersOnce was removed, autoActivatedHardwareInfo was made
+ unused, removing. (jpazdziora at redhat.com)
+- When ActivateSubscriptionPage was removed, activatedRegistrationNumber was
+ made unused, removing. (jpazdziora at redhat.com)
+- 597263 - give the focus to the ButtonBar (and thus to the Yes button), to
+ behave as RHEL 5 did. (jpazdziora at redhat.com)
+- 596101 - skip the chooseChannelPage when going Back as well, if it should not
+ be shown. (jpazdziora at redhat.com)
+- 596102 - fit hw profile into a 2x6 table (mzazrivec at redhat.com)
+- 595688 - cancel busy cursor after ValidationError (michael.mraka at redhat.com)
+- 595837 - write nice error in case of "connection reset by peer" and xmlrpc
+ protocol error (msuchy at redhat.com)
+- 585188 - we need to implement fatalError for loginPageApply and
+ createProfilePageApply. (jpazdziora at redhat.com)
+- Remove except which cannot be reached. (jpazdziora at redhat.com)
+- 585188 - refactor the RHN Register firstboot code to match firstboot 1.110 on
+ Fedora 12 and RHEL 6. (jpazdziora at redhat.com)
+- 585188 - only install legacy firstboot on RHEL 5 (and earlier), the new
+ firstboot for other systems. (jpazdziora at redhat.com)
+- 585188 - the firstboot modules for RHEL 5 shall retire in firstboot-legacy-
+ rhel5. (jpazdziora at redhat.com)
+- 593194 - fix creating the $(PREFIX)/usr/share/setuptool/setuptool.d when
+ building the package. (jpazdziora at redhat.com)
+- 595669 - fix regexp and do not fail if regexp do not match
+ (msuchy at redhat.com)
+- whitespace cleanup (msuchy at redhat.com)
+- We don't need hwdata target anymore (mzazrivec at redhat.com)
+- 580493 - use correct product logos in rhn_register (gui)
+ (mzazrivec at redhat.com)
+- 557059 - do not fail on IBM-ESXS controler where ID_PATH is not set
+ (msuchy at redhat.com)
+- 580489 - fix requires for rhn-setup-gnome (mzazrivec at redhat.com)
+- python-hwdata finaly made it into Fedora and Epel so we can remove from this
+ package and depend on python-hwdata (msuchy at redhat.com)
+- 593194 - 99rhn_register to add RHN Register to setup's list of tools.
+ (jpazdziora at redhat.com)
+- The bugzilla 556290 had errata released, python-setuptools should be pulled
+ in by python-coverage. (jpazdziora at redhat.com)
+- 584780 - move the firstboot _gui.* files to rhn-setup-gnome.
+ (jpazdziora at redhat.com)
+- 557059 - we cannot have class None. (jpazdziora at redhat.com)
+- 591798 - Completly remove hal code from rhn-client-tools for F-13 and RHEL-6
+ (msuchy at redhat.com)
+- 591422 - add hwdata.py to rhn-client-tools. (jpazdziora at redhat.com)
+- l10n: Updates to German (de) translation (ttrinks at fedoraproject.org)
+- l10n update .pot and .po files for rhn-client-tools (msuchy at redhat.com)
+- l10n - translate desktop file too (msuchy at redhat.com)
+- cleanup - removing translation file, which does not match any language code
+ (msuchy at redhat.com)
+- update po files for rhn-client-tools (msuchy at redhat.com)
* Wed May 05 2010 Jan Pazdziora 1.1.3-1
- 589100 - address issue when clients were not able to register to the server.
diff --git a/sources b/sources
index 5d78a24..1862784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62756bcbb9346a60ea220f08c3584ffe rhn-client-tools-1.1.6.tar.gz
+cd13b55e4f01af4d18504e4915867a99 rhn-client-tools-1.1.15.tar.gz
More information about the scm-commits
mailing list