From f14a98d846434b1372390d9239514ca6edf62b4a Mon Sep 17 00:00:00 2001 From: Alex Wood Date: Thu, 19 Jan 2017 15:02:14 -0500 Subject: [PATCH] Update subscription-manager to 1.19.0-1 Resolves: #1405125 - Strip null byte from end of virt uuid. (awood@redhat.com) Resolves: #1402009 - Unset TERM inside subscription-manager (khowell@redhat.com) Resolves: #1404930 - Provide GUI flow to fix proxy settings (khowell@redhat.com) Resolves: #1403387 - Fix proxy conn test short-circuit (csnyder@redhat.com) Resolves: #1401394 - Collect fqdn via `hostname -f` (khowell@redhat.com) --- .gitignore | 1 + sources | 2 +- subscription-manager.spec | 67 +++++++++++++++++++++++---------------- 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 89812fc..fba67b7 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /subscription-manager-1.18.1.tar.gz /subscription-manager-1.18.2.tar.gz /subscription-manager-1.18.6.tar.gz +/subscription-manager-1.19.0.tar.gz diff --git a/sources b/sources index f42d3fd..4164a36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subscription-manager-1.18.6.tar.gz) = c56a259c72631a6fa3e57ab5a6feff478209e3e6d5a3d6b7f98c98e94421fa43d4683697e52df522f296917da674dbcdb8271de52f7d66c783aa51587a4d7cfe +SHA512 (subscription-manager-1.19.0.tar.gz) = 3e456a02222fff26c6a64046f6d4aa9c4b0504b24e886929450c972568686c07afcb82caccc97e64197091c73220089ad6e29dbfca4c783afcd04862d3ca7f80 diff --git a/subscription-manager.spec b/subscription-manager.spec index 4c84063..02f4aaf 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -60,7 +60,7 @@ %endif Name: subscription-manager -Version: 1.18.6 +Version: 1.19.0 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -77,8 +77,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python-ethtool Requires: python-iniparse +Requires: python-decorator +Requires: dbus-x11 Requires: virt-what -Requires: python-rhsm >= 1.18.1 +Requires: python-rhsm >= 1.19.0 Requires: python-decorator %if 0%{?sles_version} @@ -218,6 +220,7 @@ Summary: Subscription Manager plugins for DNF Group: System Environment/Base Requires: %{name} = %{version}-%{release} Requires: dnf >= 1.0.0 +Requires: python2-dnf-plugins-core %description -n dnf-plugin-subscription-manager This package provides plugins to interact with repositories and subscriptions @@ -330,14 +333,6 @@ rm -rf %{buildroot} %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker %attr(755,root,root) %{_libexecdir}/rhsmd -# init scripts and systemd services -%if %use_systemd - %attr(644,root,root) %{_unitdir}/rhsmcertd.service - %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf -%else - %attr(755,root,root) %{_initrddir}/rhsmcertd -%endif - # our config dirs and files %attr(755,root,root) %dir %{_sysconfdir}/pki/consumer %attr(755,root,root) %dir %{_sysconfdir}/pki/entitlement @@ -346,8 +341,6 @@ rm -rf %{buildroot} %attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf %config %attr(644,root,root) %{_sysconfdir}/rhsm/logging.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.SubscriptionManager.conf - # PAM config %if !0%{?sles_version} %{_sysconfdir}/pam.d/subscription-manager @@ -365,7 +358,6 @@ rm -rf %{buildroot} # misc system config %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager %attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd -%{_datadir}/dbus-1/system-services/com.redhat.SubscriptionManager.service %attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/spool/rhsm/debug @@ -382,12 +374,7 @@ rm -rf %{buildroot} %{_sysconfdir}/bash_completion.d/rhsm-icon %{_sysconfdir}/bash_completion.d/rhsmcertd -%dir %{python_sitelib}/ %dir %{python_sitelib}/subscription_manager -%dir %{python_sitelib}/subscription_manager/api -%dir %{python_sitelib}/subscription_manager/branding -%dir %{python_sitelib}/subscription_manager/model -%dir %{python_sitelib}/subscription_manager/plugin # code, python modules and packages %{python_sitelib}/subscription_manager-*.egg-info/* @@ -419,6 +406,30 @@ rm -rf %{buildroot} %{_prefix}/lib/yum-plugins/product-id.py* %{_prefix}/lib/yum-plugins/search-disabled-repos.py* +# rhsmlib +%dir %{python_sitelib}/rhsmlib +%{python_sitelib}/rhsmlib/*.py* +%{python_sitelib}/rhsmlib/candlepin/*.py* +%{python_sitelib}/rhsmlib/compat/*.py* +%{python_sitelib}/rhsmlib/facts/*.py* +%{python_sitelib}/rhsmlib/services/*.py* +%{python_sitelib}/rhsmlib/dbus/*.py* +%{python_sitelib}/rhsmlib/dbus/facts/*.py* +%{python_sitelib}/rhsmlib/dbus/objects/*.py* + +%{_datadir}/polkit-1/actions/com.redhat.*.policy +%{_datadir}/dbus-1/system-services/com.redhat.*.service +%attr(755,root,root) %{_libexecdir}/rhsm*-service + +# Despite the name similarity dbus-1/system.d has nothing to do with systemd +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.*.conf +%if %use_systemd + %attr(644,root,root) %{_unitdir}/*.service + %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf +%else + %attr(755,root,root) %{_initrddir}/rhsmcertd +%endif + # Incude rt CLI tool %dir %{python_sitelib}/rct %{python_sitelib}/rct/*.py* @@ -448,11 +459,6 @@ rm -rf %{buildroot} %{_bindir}/rhsm-icon %dir %{python_sitelib}/subscription_manager/gui -%dir %{python_sitelib}/subscription_manager/gui/data -%dir %{python_sitelib}/subscription_manager/gui/data/ui -%dir %{python_sitelib}/subscription_manager/gui/data/glade -%dir %{python_sitelib}/subscription_manager/gui/data/icons - %{python_sitelib}/subscription_manager/gui/*.py* %{python_sitelib}/subscription_manager/gui/data/ui/*.ui %{python_sitelib}/subscription_manager/gui/data/glade/*.glade @@ -521,10 +527,6 @@ rm -rf %{buildroot} %files -n subscription-manager-initial-setup-addon %defattr(-,root,root,-) %dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ -%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/ -%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/ -%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/ -%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/ %{_datadir}/anaconda/addons/com_redhat_subscription_manager/*.py* %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/*.py* %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/*.ui @@ -599,6 +601,17 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jan 19 2017 Alex Wood 1.19.0-1 +- Bump version to 1.19 (adarshvritant@gmail.com) +- 1405125: Strip null byte from end of virt uuid. (awood@redhat.com) +- Provide DBus objects for configuration, facts, and registration. + (awood@redhat.com) +- Use repo location for python-rhsm dependency. (awood@redhat.com) +- 1402009: Unset TERM inside subscription-manager (khowell@redhat.com) +- 1404930: Provide GUI flow to fix proxy settings (khowell@redhat.com) +- 1403387: Fix proxy conn test short-circuit (csnyder@redhat.com) +- 1401394: Collect fqdn via `hostname -f` (khowell@redhat.com) + * Fri Dec 09 2016 Vritant Jain 1.18.6-1 - 1401078: "Remote server error" on BadStatusLine (khowell@redhat.com) - 1390712: Add --remove-rhn-packages to man pages (khowell@redhat.com)