diff --git a/.gitignore b/.gitignore index 42119a2..b44105f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /subscription-manager-1.10.1.tar.gz /subscription-manager-1.10.2.tar.gz /subscription-manager-1.10.3.tar.gz +/subscription-manager-1.10.5.tar.gz diff --git a/sources b/sources index 4655641..72d1793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9835e9a137e927cb613d7759524696e3 subscription-manager-1.10.3.tar.gz +999bb27231bd5936768342694217fbcb subscription-manager-1.10.5.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index de41a41..89b5a17 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -11,7 +11,7 @@ %endif Name: subscription-manager -Version: 1.10.3 +Version: 1.10.5 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -27,11 +27,10 @@ URL: https://fedorahosted.org/subscription-manager/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python-ethtool -Requires: python-simplejson Requires: python-iniparse Requires: pygobject2 Requires: virt-what -Requires: python-rhsm >= 1.9.1-1 +Requires: python-rhsm >= 1.10.3 Requires: dbus-python Requires: yum >= 3.2.19-15 Requires: usermode @@ -204,6 +203,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/cert_sorter.py* %{_datadir}/rhsm/subscription_manager/cli.py* %{_datadir}/rhsm/subscription_manager/dbus_interface.py* +%{_datadir}/rhsm/subscription_manager/dmiinfo.py* %{_datadir}/rhsm/subscription_manager/entbranding.py* %{_datadir}/rhsm/subscription_manager/factlib.py* %{_datadir}/rhsm/subscription_manager/facts.py* @@ -315,15 +315,14 @@ rm -rf %{buildroot} %files -n subscription-manager-firstboot %defattr(-,root,root,-) +# RHEL7 and beyond: +%if 0%{?rhel} > 6 +%{_datadir}/firstboot/modules/rhsm_login.py* +%else %{_datadir}/rhn/up2date_client/firstboot/rhsm_login.py* - -%if 0%{?rhel} < 6 - %if 0%{?fedora} <= 12 - # we are building for fedora <= 12 or rhel < 6 - %{_prefix}/share/firstboot/modules/rhsm_login.py* - %endif %endif + %files -n subscription-manager-migration %defattr(-,root,root,-) %dir %{_datadir}/rhsm/subscription_manager/migrate @@ -386,6 +385,23 @@ fi %endif %changelog +* Fri Oct 25 2013 ckozak 1.10.5-1 +- 1021581: account/contract display nothing when no data exists + (ckozak@redhat.com) +- Swap heading of selectsla/confirmsubs widgets. (alikins@redhat.com) +- 1006748: replace simplejson with 'ourjson' (alikins@redhat.com) + +* Thu Oct 17 2013 ckozak 1.10.4-1 +- 1017351: ignore dbus failures on show_window (alikins@redhat.com) +- 1016643: Fix firstboot issues with new firstboot. (alikins@redhat.com) +- 1005420: adding --ondate to manpage (dlackey@redhat.com.com) +- 1007580: Add contract number to the output of list --available + (bkearney@redhat.com) +- 1017299: handle dmidecode module not installed (alikins@redhat.com) +- 846331: Add tooltips to the filters page (bkearney@redhat.com) +- 1015553: fix help message for no-overlap. display usage requirement + (ckozak@redhat.com) + * Wed Oct 02 2013 ckozak 1.10.3-1 - Latest strings from zanata. (alikins@redhat.com) - Latest string catalog. (alikins@redhat.com)