From b898fad86e31e24828a85dc415ab7b6e2fa9199e Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 8 Mar 2013 11:58:53 -0400 Subject: [PATCH] Update subscription-manager to 1.8.4-1 --- .gitignore | 1 + sources | 2 +- subscription-manager.spec | 127 ++++++++++++++++++++++++++++++-------- 3 files changed, 103 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 795d9d8..423b4be 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /subscription-manager-1.8.1.tar.gz /subscription-manager-1.8.2.tar.gz /subscription-manager-1.8.3.tar.gz +/subscription-manager-1.8.4.tar.gz diff --git a/sources b/sources index 0c1ba2f..c6ddb78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ce9d4438687384ad121921cf5330b97 subscription-manager-1.8.3.tar.gz +3baa72a23f8e7dfb313eb6acc38faa21 subscription-manager-1.8.4.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 6151af2..6251587 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -1,5 +1,9 @@ # Prefer systemd over sysv on Fedora 17+ and RHEL 7+ %define use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7) +%define use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6) + + +%define rhsm_plugins_dir /usr/share/rhsm-plugins # A couple files are for RHEL 5 only: %if 0%{?rhel} == 5 @@ -7,7 +11,7 @@ %endif Name: subscription-manager -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -26,13 +30,24 @@ Requires: python-ethtool Requires: python-simplejson Requires: python-iniparse Requires: pygobject2 -Requires: python-dateutil Requires: virt-what -Requires: python-rhsm >= 1.8.2 +Requires: python-rhsm >= 1.8.7 Requires: dbus-python Requires: yum >= 3.2.19-15 Requires: usermode +# dateutil is better than our version +# built using PyXML utils, but PyXML is +# deprecated for f17+, and dateutil doesn't +# exist on rhel5 +%if %use_dateutil +# we are building for fedora >= 12 or rhel >= 6 +Requires: python-dateutil +%else +Requires: PyXML +%endif + +%{?el5:Requires: rhn-setup-gnome >= 0.4.20-49} # There's no dmi to read on these arches, so don't pull in this dep. %ifnarch ppc ppc64 s390 s390x Requires: python-dmidecode @@ -175,39 +190,51 @@ rm -rf %{buildroot} %dir %{_datadir}/rhsm %dir %{_datadir}/rhsm/subscription_manager -%{_datadir}/rhsm/subscription_manager/__init__.py* -%{_datadir}/rhsm/subscription_manager/i18n.py* -%{_datadir}/rhsm/subscription_manager/i18n_optparse.py* + +%{_datadir}/rhsm/subscription_manager/async.py* +%{_datadir}/rhsm/subscription_manager/base_plugin.py* +%{_datadir}/rhsm/subscription_manager/branding +%{_datadir}/rhsm/subscription_manager/cache.py* +%{_datadir}/rhsm/subscription_manager/certdirectory.py* +%{_datadir}/rhsm/subscription_manager/certlib.py* +%{_datadir}/rhsm/subscription_manager/certmgr.py* +%{_datadir}/rhsm/subscription_manager/cert_sorter.py* %{_datadir}/rhsm/subscription_manager/cli.py* +%{_datadir}/rhsm/subscription_manager/factlib.py* +%{_datadir}/rhsm/subscription_manager/facts.py* +%{_datadir}/rhsm/subscription_manager/hwprobe.py* +%{_datadir}/rhsm/subscription_manager/isodate.py* +%{_datadir}/rhsm/subscription_manager/i18n_optparse.py* +%{_datadir}/rhsm/subscription_manager/i18n.py* +%{_datadir}/rhsm/subscription_manager/identity.py* +%{_datadir}/rhsm/subscription_manager/injection.py* +%{_datadir}/rhsm/subscription_manager/injectioninit.py* +%{_datadir}/rhsm/subscription_manager/__init__.py* +%{_datadir}/rhsm/subscription_manager/jsonwrapper.py* +%{_datadir}/rhsm/subscription_manager/listing.py* +%{_datadir}/rhsm/subscription_manager/lock.py* +%{_datadir}/rhsm/subscription_manager/logutil.py* %{_datadir}/rhsm/subscription_manager/managercli.py* %{_datadir}/rhsm/subscription_manager/managerlib.py* -%{_datadir}/rhsm/subscription_manager/async.py* -%{_datadir}/rhsm/subscription_manager/logutil.py* +%{_datadir}/rhsm/subscription_manager/plugins.py* +%{_datadir}/rhsm/subscription_manager/productid.py* +%{_datadir}/rhsm/subscription_manager/quantity.py* +%{_datadir}/rhsm/subscription_manager/release.py* %{_datadir}/rhsm/subscription_manager/repolib.py* +%{_datadir}/rhsm/subscription_manager/utils.py* +%{_datadir}/rhsm/subscription_manager/validity.py* +# subscription-manager plugins +%dir %{rhsm_plugins_dir} +%dir %{_sysconfdir}/rhsm/pluginconf.d +# add default plugins here when we have some + +# yum plugins # Using _prefix + lib here instead of libdir as that evaluates to /usr/lib64 on x86_64, # but yum plugins seem to normally be sent to /usr/lib/: %{_prefix}/lib/yum-plugins/subscription-manager.py* %{_prefix}/lib/yum-plugins/product-id.py* -%{_datadir}/rhsm/subscription_manager/certlib.py* -%{_datadir}/rhsm/subscription_manager/certdirectory.py* -%{_datadir}/rhsm/subscription_manager/cert_sorter.py* -%{_datadir}/rhsm/subscription_manager/validity.py* -%{_datadir}/rhsm/subscription_manager/hwprobe.py* -%{_datadir}/rhsm/subscription_manager/lock.py* -%{_datadir}/rhsm/subscription_manager/facts.py* -%{_datadir}/rhsm/subscription_manager/factlib.py* -%{_datadir}/rhsm/subscription_manager/productid.py* -%{_datadir}/rhsm/subscription_manager/cache.py* -%{_datadir}/rhsm/subscription_manager/branding -%{_datadir}/rhsm/subscription_manager/quantity.py* -%{_datadir}/rhsm/subscription_manager/jsonwrapper.py* -%{_datadir}/rhsm/subscription_manager/certmgr.py* -%{_datadir}/rhsm/subscription_manager/listing.py* -%{_datadir}/rhsm/subscription_manager/release.py* -%{_datadir}/rhsm/subscription_manager/utils.py* - %attr(755,root,root) %{_sbindir}/subscription-manager %attr(755,root,root) %{_bindir}/subscription-manager @@ -350,6 +377,54 @@ fi %endif %changelog +* Fri Mar 08 2013 Devan Goodwin 1.8.4-1 +- Pull latest strings from zanata. (dgoodwin@redhat.com) +- Use PyXML for iso8601 date on RHEL5 and dateutil after (alikins@redhat.com) +- Major switchover to server for compliance checking logic. (dgoodwin@redhat.com) +- Introduce dependency injection framework. (dgoodwin@redhat.com) +- 916369: Do not persist config changes until the action completes + (bkearney@redhat.com) +- Fix a bug with changing installed products during healing. + (dgoodwin@redhat.com) +- 912776: fix migration test scripts to expect get_int usage + (alikins@redhat.com) +- 912776: cast port numbers from cli to int immediately (alikins@redhat.com) +- 912776: use config.get_int for server port as well (alikins@redhat.com) +- 905649: subscription-manager does not work with dbus-python-1.1.1-1 + (wpoteat@redhat.com) +- use ngettext for plural messages in certlib/managercli (alikins@redhat.com) +- 912776: use cfg.get_int for proxy port (alikins@redhat.com) +- 878097: update service-level org key help text (alikins@redhat.com) +- Handle manifests with no subscriptions in the archive (alikins@redhat.com) +- 878664: Add filename support to the bash completion for the rct tool. + (bkearney@redhat.com) +- 877590: Changes to the branding messages when the user attempts to register + twice (bkearney@redhat.com) +- New plugin framework. (alikins@redhat.com / awood@redhat.com) +- 886115: Remove line continuations within strings. (bkearney@redhat.com) +- 913302: Support Level and Support Type should be shown as Service Level and + Service Type (bkearney@redhat.com) +- Add unknown product status state. (dgoodwin@redhat.com) +- 913703: Prefer the use of SKU over Product ID (bkearney@redhat.com) +- 913720: Use the term order number instead of subscription id + (bkearney@redhat.com) +- 878634: Use correct capitalization for ID in the rct tool + (bkearney@redhat.com) +- 878097: Help text for service-level command should be consistent with other + help texts (bkearney@redhat.com) +- 906554: Add ui_repoid_vars line to yum based on the variables which are in + the baseurl (bkearney@redhat.com) +- 912707: Remove a use of the deprecated hasNow() function. + (bkearney@redhat.com) +- 913187: Allow older manifests to print out correctly. (bkearney@redhat.com) +- 912776: Cast proxy port to an integer. (awood@redhat.com) +- 882459: Deprecated message in help for cert-interval (wpoteat@redhat.com) +- 895447: Changed messages to distinguish between local and server-side + removal. (wpoteat@redhat.com) +- 908671: Display the pool ID when available. (awood@redhat.com) +- 911386: Displaying combined Service Level and Type should handle empty values + for both items (jmolet@redhat.com) + * Thu Feb 14 2013 Devan Goodwin 1.8.3-1 - string and string catalog update from zanata (alikins@redhat.com) - 908954: Ensure that 'Not Set' is shown in the preferences dialog if it is not