Update subscription-manager to 1.23.1-1

Resolves: #1609052 - DNF Plugin needs config initiated earlier (wpoteat@redhat.com)
Resolves: #1608963 - Minimize packaging for python 3 (wpoteat@redhat.com)
Resolves: #1602056 - Added role subcommand ENT-719 (jhnidek@redhat.com)
Resolves: #1512944 - Fix up remaining python2 deps ENT-724 (csnyder@redhat.com)
Resolves: #1594733 - Fix GetStatus in com.redhat.RHSM1.Entitlement ENT-641
Resolves: #1581777 - Reraise exception properly. ENT-566 (jhnidek@redhat.com)
Resolves: #1581410 - ENT-572: subman should require dnf-plugin-subscription-manager
Resolves: #1576423 - Polished changes provided in #1816 and added unit test.
Resolves: #1571998 - Ignore HTB repos (nmoumoul@redhat.com)
Resolves: #1589296 - subman list option --after now named --afterdate
Resolves: #1558411 - Begin building dnf-plugin-subscription-manager for RHEL 7
Resolves: #1553266 - When d-bus methods are unavailable, show appropriate message. *
Resolves: #1580996 - Fix comparision of objects in Python 3 (ENT-578)
Resolves: #1576582 - Make rhsm.full_fresh_on_yum=1 working again (ENT-534)
Resolves: #1510920 - Allow access to job cancellation API (wpoteat@redhat.com)
Resolves: #1512944 - Subscription-manager should be able to run using python3

.gitignore

@@ -83,3 +83,5 @@
 /subscription-manager-cockpit-1.21.4.tar.gz
 /subscription-manager-1.21.5.tar.gz
 /subscription-manager-cockpit-1.21.5.tar.gz
+/subscription-manager-1.23.1.tar.gz
+/subscription-manager-cockpit-1.23.1.tar.gz

sources

@@ -1,2 +1,2 @@
-SHA512 (subscription-manager-1.21.5.tar.gz) = 2e8feaad484d7626842f4081edd777612fb5bb28bf821411a354c34a0346aa103e6c7758f49535493eb849a6a8ada9737fdef61589abb43dce83fd3d506ec12c
+SHA512 (subscription-manager-1.23.1.tar.gz) = b7ecfaeb3065180b5fc1a388f88803b5405730962312a42a40c8f11aef8cea201988b89a2fb97501e2390c73c6d0600f29843758825b9f174ebb6d7d7df2ae31
-SHA512 (subscription-manager-cockpit-1.21.5.tar.gz) = 606c1f3e426a878935b94e2d955ce635517b365c3cdd6022aa75dc1207b92106509e397ca29c16d3c0d18312f4068a78707b802d2b04ab051908068b3f00675c
+SHA512 (subscription-manager-cockpit-1.23.1.tar.gz) = 742d0e396dcd73418eb776062d5cc0df793ae3cca48ca270b38f3ba7c0bff6b738abff89c9f780f65372c9b9f2b21ec3d0d0b91b5ee615d3135d2aaaf6a7ccb9

subscription-manager.spec

@@ -5,7 +5,6 @@
 %global has_ostree %use_systemd && 0%{?suse_version} == 0
 %global use_initial_setup 1
 %global use_firstboot 0
-%global use_kitchen 1
 %global use_inotify 1
 %global py2_package_prefix python2
 
@@ -44,7 +43,6 @@
 %if 0%{?rhel} == 6 || 0%{?suse_version}
 %global use_initial_setup 0
 %global use_firstboot 1
-%global use_kitchen 0
 %global use_inotify 0
 %endif
 
@@ -54,7 +52,7 @@
 %global use_rhsm_gtk 0
 %endif
 
-%global use_dnf %{with python3} && (0%{?fedora} || (0%{?rhel}))
+%global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7)
 %global use_yum (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?suse_version})
 %global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7
 
@@ -63,7 +61,7 @@
 %global __python %__python3
 %global py_package_prefix python%{python3_pkgversion}
 %global rhsm_package_name %{py_package_prefix}-subscription-manager-rhsm
-%define include_intentctl 1
+%define include_syspurpose 1
 %else
 %global py_package_prefix python
 %global rhsm_package_name subscription-manager-rhsm
@@ -129,11 +127,11 @@
 %define with_cockpit WITH_COCKPIT=false
 %endif
 
-%define subpackages SUBPACKAGES="%{?include_intentctl:intentctl}"
+%define subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}"
 
 Name: subscription-manager
-Version: 1.21.5
+Version: 1.23.1
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 Group:   System Environment/Base
 License: GPLv2
@@ -152,7 +150,7 @@ Source1: %{name}-cockpit-%{version}.tar.gz
 Source2: subscription-manager-rpmlintrc
 %endif
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1200
+%if 0%{?suse_version} < 1200
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 
@@ -187,8 +185,8 @@ Requires: %{?suse_version:dbus-1-python} %{!?suse_version:dbus-python}
 Requires: %{?suse_version:yum} %{!?suse_version:yum >= 3.2.29-73}
 %endif
 
-%if %{use_kitchen}
+%if (%{use_dnf} && (0%{?fedora} || 0%{?rhel} >= 8))
-Requires: %{py_package_prefix}-kitchen
+Requires: dnf-plugin-subscription-manager = %{version}
 %endif
 
 # Support GTK2 and GTK3 on both SUSE and RHEL...
@@ -197,7 +195,7 @@ Requires: %{?gtk3:python-gobject} %{!?gtk3:python-gobject2, libzypp, zypp-plugin
 %else
 Requires:  usermode
 %if %{with python3}
-Requires: python3-gobject
+Requires: python3-gobject-base
 %else
 Requires:  %{?gtk3:gobject-introspection, pygobject3-base} %{!?gtk3:pygobject2}
 %endif
@@ -222,7 +220,7 @@ Requires(post): %{?suse_version:aaa_base} %{!?suse_version:chkconfig}
 Requires(preun): %{?suse_version:aaa_base} %{!?suse_version:chkconfig, initscripts}
 %endif
 
-BuildRequires: %{?suse_version:python2-devel >= 2.6} %{!?suse_version:%{py_package_prefix}-devel}
+BuildRequires: %{?suse_version:python-devel >= 2.6} %{!?suse_version:%{py_package_prefix}-devel}
 BuildRequires: openssl-devel
 BuildRequires: gcc
 BuildRequires: %{py_package_prefix}-setuptools
@@ -231,12 +229,12 @@ BuildRequires: intltool
 BuildRequires: libnotify-devel
 BuildRequires: %{py_package_prefix}-six
 
-%if %use_subman_gui
+%if %{use_subman_gui} || %{use_cockpit}
 BuildRequires: desktop-file-utils
 %endif
 
 BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel}
-BuildRequires: %{?suse_version:lsb-release, distribution-release} %{!?suse_version:redhat-lsb}
+BuildRequires: %{?suse_version:distribution-release} %{!?suse_version:system-release}
 BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel}
 BuildRequires: %{?suse_version:update-desktop-files} %{!?suse_version:scrollkeeper}
 
@@ -261,13 +259,13 @@ to manage subscriptions and yum repositories from the Red Hat entitlement
 platform.
 
 %if %{with python3}
-%package -n %{py_package_prefix}-intentctl
+%package -n %{py_package_prefix}-syspurpose
-Summary: A commandline utility for declaring system intent
+Summary: A commandline utility for declaring system syspurpose
 Group: System Environment/Base
 
-%description -n %{py_package_prefix}-intentctl
+%description -n %{py_package_prefix}-syspurpose
-Provides the intentctl commandline utility. This utility manages the
+Provides the syspurpose commandline utility. This utility manages the
-system intent.
+system syspurpose.
 %endif
 
 
@@ -285,7 +283,7 @@ from the server. Populates /etc/docker/certs.d appropriately.
 %package -n rhsm-gtk
 Summary: GTK+ widgets used by subscription-manager-gui and initial_setup
 Group: System Environment/Base
-Requires: %{?gtk3:pygobject3, gtk3} %{!?gtk3:pygtk2, pygtk2-libglade}
+Requires: %{?gtk3:%{py_package_prefix}-gobject, gtk3} %{!?gtk3:pygtk2, pygtk2-libglade}
 Requires: usermode-gtk
 # Fedora can figure this out automatically, but RHEL cannot:
 # See #987071
@@ -398,7 +396,7 @@ This package contains the initial-setup screens for subscription-manager.
 Summary: A plugin for handling OSTree content.
 Group: System Environment/Base
 
-Requires: pygobject3-base
+Requires: %{py_package_prefix}-gobject-base
 # plugin needs a slightly newer version of python-iniparse for 'tidy'
 Requires:  %{py_package_prefix}-iniparse >= 0.4
 Requires: %{name} = %{version}-%{release}
@@ -483,7 +481,7 @@ and to receive access to content.
 %if %use_cockpit
 %package -n subscription-manager-cockpit
 Summary: Subscription Manager Cockpit UI
-License: LGPLv2.1+
+License: GPLv2
 BuildArch: noarch
 
 Requires: subscription-manager
@@ -499,7 +497,7 @@ Subscription Manager Cockpit UI
 
 %build
 make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
-    LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" %{?gtk_version} %{?subpackages} %{?include_intentctl:INCLUDE_INTENTCTL="1"}
+    LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" %{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"}
 
 %if %{with python2_rhsm}
 python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
@@ -518,7 +516,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
     %{?with_subman_gui} \
     %{?with_cockpit} \
     %{?subpackages} \
-    %{?include_intentctl:INCLUDE_INTENTCTL="1"}
+    %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"}
 
 %if %{with python2_rhsm}
 mkdir -p %{buildroot}%{python2_sitearch}/rhsm
@@ -574,10 +572,15 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
     tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot}
 %endif
 
+%if %{with python3}
+%py_byte_compile %{__python3} %{buildroot}%{rhsm_plugins_dir}/
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/anaconda/addons/com_redhat_subscription_manager/
+%endif
 
 # base/cli tools use the gettext domain 'rhsm', while the
 # gnome-help tools use domain 'subscription-manager'
 %files -f rhsm.lang
+%defattr(-,root,root,-)
 %if 0%{?suse_version}
 %dir %{_sysconfdir}/pki
 
@@ -679,34 +682,34 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %dir %{python_sitearch}/subscription_manager
 
 # code, python modules and packages
-%{python2_sitearch}/subscription_manager-*.egg-info/*
+%{python_sitearch}/subscription_manager-*.egg-info/*
-%{python2_sitearch}/subscription_manager/*.py*
+%{python_sitearch}/subscription_manager/*.py*
-%{python2_sitearch}/subscription_manager/api/*.py*
+%{python_sitearch}/subscription_manager/api/*.py*
-%{python2_sitearch}/subscription_manager/branding/*.py*
+%{python_sitearch}/subscription_manager/branding/*.py*
-%{python2_sitearch}/subscription_manager/model/*.py*
+%{python_sitearch}/subscription_manager/model/*.py*
-%{python2_sitearch}/subscription_manager/plugin/__init__.py*
+%{python_sitearch}/subscription_manager/plugin/__init__.py*
-%{python2_sitearch}/subscription_manager/scripts/*.py*
+%{python_sitearch}/subscription_manager/scripts/*.py*
 %if %{with python3}
-%{python2_sitearch}/subscription_manager/__pycache__
+%{python_sitearch}/subscription_manager/__pycache__
-%{python2_sitearch}/subscription_manager/api/__pycache__
+%{python_sitearch}/subscription_manager/api/__pycache__
-%{python2_sitearch}/subscription_manager/branding/__pycache__
+%{python_sitearch}/subscription_manager/branding/__pycache__
-%{python2_sitearch}/subscription_manager/model/__pycache__
+%{python_sitearch}/subscription_manager/model/__pycache__
-%{python2_sitearch}/subscription_manager/plugin/__pycache__
+%{python_sitearch}/subscription_manager/plugin/__pycache__
-%{python2_sitearch}/subscription_manager/scripts/__pycache__
+%{python_sitearch}/subscription_manager/scripts/__pycache__
 %endif
 
 # our gtk2/gtk3 compat modules
 %dir %{python_sitearch}/subscription_manager/ga_impls
-%{python2_sitearch}/subscription_manager/ga_impls/__init__.py*
+%{python_sitearch}/subscription_manager/ga_impls/__init__.py*
 %if %{with python3}
-%{python2_sitearch}/subscription_manager/ga_impls/__pycache__
+%{python_sitearch}/subscription_manager/ga_impls/__pycache__
 %endif
 
 %if 0%{?gtk3}
-%{python2_sitearch}/subscription_manager/ga_impls/ga_gtk3.py*
+%{python_sitearch}/subscription_manager/ga_impls/ga_gtk3.py*
 %else
 %dir %{python_sitearch}/subscription_manager/ga_impls/ga_gtk2
-%{python2_sitearch}/subscription_manager/ga_impls/ga_gtk2/*.py*
+%{python_sitearch}/subscription_manager/ga_impls/ga_gtk2/*.py*
 %endif
 
 # subscription-manager plugins
@@ -730,23 +733,23 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 # rhsmlib
 %dir %{python_sitearch}/rhsmlib
-%{python2_sitearch}/rhsmlib/*.py*
+%{python_sitearch}/rhsmlib/*.py*
-%{python2_sitearch}/rhsmlib/candlepin/*.py*
+%{python_sitearch}/rhsmlib/candlepin/*.py*
-%{python2_sitearch}/rhsmlib/compat/*.py*
+%{python_sitearch}/rhsmlib/compat/*.py*
-%{python2_sitearch}/rhsmlib/facts/*.py*
+%{python_sitearch}/rhsmlib/facts/*.py*
-%{python2_sitearch}/rhsmlib/services/*.py*
+%{python_sitearch}/rhsmlib/services/*.py*
-%{python2_sitearch}/rhsmlib/dbus/*.py*
+%{python_sitearch}/rhsmlib/dbus/*.py*
-%{python2_sitearch}/rhsmlib/dbus/facts/*.py*
+%{python_sitearch}/rhsmlib/dbus/facts/*.py*
-%{python2_sitearch}/rhsmlib/dbus/objects/*.py*
+%{python_sitearch}/rhsmlib/dbus/objects/*.py*
 %if %{with python3}
-%{python2_sitearch}/rhsmlib/__pycache__
+%{python_sitearch}/rhsmlib/__pycache__
-%{python2_sitearch}/rhsmlib/candlepin/__pycache__
+%{python_sitearch}/rhsmlib/candlepin/__pycache__
-%{python2_sitearch}/rhsmlib/compat/__pycache__
+%{python_sitearch}/rhsmlib/compat/__pycache__
-%{python2_sitearch}/rhsmlib/dbus/__pycache__
+%{python_sitearch}/rhsmlib/dbus/__pycache__
-%{python2_sitearch}/rhsmlib/dbus/facts/__pycache__
+%{python_sitearch}/rhsmlib/dbus/facts/__pycache__
-%{python2_sitearch}/rhsmlib/dbus/objects/__pycache__
+%{python_sitearch}/rhsmlib/dbus/objects/__pycache__
-%{python2_sitearch}/rhsmlib/facts/__pycache__
+%{python_sitearch}/rhsmlib/facts/__pycache__
-%{python2_sitearch}/rhsmlib/services/__pycache__
+%{python_sitearch}/rhsmlib/services/__pycache__
 %endif
 
 %{_datadir}/polkit-1/actions/com.redhat.*.policy
@@ -764,17 +767,17 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 # Incude rt CLI tool
 %dir %{python_sitearch}/rct
-%{python2_sitearch}/rct/*.py*
+%{python_sitearch}/rct/*.py*
 %if %{with python3}
-%{python2_sitearch}/rct/__pycache__
+%{python_sitearch}/rct/__pycache__
 %endif
 %attr(755,root,root) %{_bindir}/rct
 
 # Include consumer debug CLI tool
 %dir %{python_sitearch}/rhsm_debug
-%{python2_sitearch}/rhsm_debug/*.py*
+%{python_sitearch}/rhsm_debug/*.py*
 %if %{with python3}
-%{python2_sitearch}/rhsm_debug/__pycache__
+%{python_sitearch}/rhsm_debug/__pycache__
 %endif
 %attr(755,root,root) %{_bindir}/rhsm-debug
 
@@ -789,13 +792,14 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 %if %{use_rhsm_gtk}
 %files -n rhsm-gtk
+%defattr(-,root,root,-)
 %dir %{python_sitearch}/subscription_manager/gui
-%{python2_sitearch}/subscription_manager/gui/*.py*
+%{python_sitearch}/subscription_manager/gui/*.py*
-%{python2_sitearch}/subscription_manager/gui/data/ui/*.ui
+%{python_sitearch}/subscription_manager/gui/data/ui/*.ui
-%{python2_sitearch}/subscription_manager/gui/data/glade/*.glade
+%{python_sitearch}/subscription_manager/gui/data/glade/*.glade
-%{python2_sitearch}/subscription_manager/gui/data/icons/*.svg
+%{python_sitearch}/subscription_manager/gui/data/icons/*.svg
 %if %{with python3}
-%{python2_sitearch}/subscription_manager/gui/__pycache__
+%{python_sitearch}/subscription_manager/gui/__pycache__
 %endif
 %endif
 
@@ -803,6 +807,7 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %if %{use_subman_gui}
 #%files -n subscription-manager-gui -f subscription-manager.lang
 %files -n subscription-manager-gui
+%defattr(-,root,root,-)
 %attr(755,root,root) %{_sbindir}/subscription-manager-gui
 %if 0%{?suse_version}
 %dir %{python_sitearch}/subscription_manager/gui/data
@@ -857,6 +862,7 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %if %use_initial_setup
 
 %files -n subscription-manager-initial-setup-addon
+%defattr(-,root,root,-)
 %dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/
 %{_datadir}/anaconda/addons/com_redhat_subscription_manager/*.py*
 %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/*.py*
@@ -876,10 +882,11 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 
 %files -n subscription-manager-migration
+%defattr(-,root,root,-)
 %dir %{python_sitearch}/subscription_manager/migrate
-%{python2_sitearch}/subscription_manager/migrate/*.py*
+%{python_sitearch}/subscription_manager/migrate/*.py*
 %if %{with python3}
-%{python2_sitearch}/subscription_manager/migrate/__pycache__
+%{python_sitearch}/subscription_manager/migrate/__pycache__
 %endif
 %attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm
 
@@ -891,17 +898,19 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %endif
 
 %if %{with python3}
-%files -n %{py_package_prefix}-intentctl
+%files -n %{py_package_prefix}-syspurpose
-%dir %{python3_sitelib}/intentctl*.egg-info
+%defattr(-,root,root,-)
-%{python3_sitelib}/intentctl*.egg-info/*
+%dir %{python3_sitelib}/syspurpose*.egg-info
-%dir %{_sysconfdir}/rhsm/intent
+%{python3_sitelib}/syspurpose*.egg-info/*
-%dir %{python3_sitelib}/intentctl
+%dir %{_sysconfdir}/rhsm/syspurpose
-%{python3_sitelib}/intentctl/{*.py*,__pycache__/*}
+%dir %{python3_sitelib}/syspurpose
+%{python3_sitelib}/syspurpose/{*.py*,__pycache__/*}
 
-%attr(755, root, root) %{_sbindir}/intentctl
+%attr(755, root, root) %{_sbindir}/syspurpose
 %endif
 
 %files -n subscription-manager-plugin-container
+%defattr(-,root,root,-)
 %if 0%{?suse_version}
 %dir %{_sysconfdir}/docker
 %dir %{_sysconfdir}/docker/certs.d
@@ -913,7 +922,7 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %if %{with python3}
 %{rhsm_plugins_dir}/__pycache__
 %endif
-%{python2_sitearch}/subscription_manager/plugin/container.py*
+%{python_sitearch}/subscription_manager/plugin/container.py*
 
 # Copying Red Hat CA cert into each directory:
 %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
@@ -923,38 +932,45 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 %if %has_ostree
 %files -n subscription-manager-plugin-ostree
+%defattr(-,root,root,-)
 %{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf
 %{rhsm_plugins_dir}/ostree_content.py*
-%{python2_sitearch}/subscription_manager/plugin/ostree/*.py*
+%{python_sitearch}/subscription_manager/plugin/ostree/*.py*
 %if %{with python3}
-%{python2_sitearch}/subscription_manager/plugin/ostree/__pycache__
+%{python_sitearch}/subscription_manager/plugin/ostree/__pycache__
 %endif
 %endif
 
 
 %if %use_firstboot
 %files -n subscription-manager-firstboot
+%defattr(-,root,root,-)
 %if 0%{?suse_version}
 %dir %{_datadir}/rhn
 %dir %{_datadir}/rhn/up2date_client
 %dir %{_datadir}/rhn/up2date_client/firstboot
 %endif
+# Not explicitly byte compiling this as we do not support firstboot
+# on newer versions of fedora
 %{_datadir}/rhn/up2date_client/firstboot/rhsm_login.py*
 %endif
 
 
 %if %use_dnf
 %files -n dnf-plugin-subscription-manager
-%{python2_sitearch}/dnf-plugins/*
+%defattr(-,root,root,-)
+%{python_sitearch}/dnf-plugins/*
 %endif
 
 
 %files -n %{rhsm_package_name}
+%defattr(-,root,root,-)
 %dir %{python_sitearch}/rhsm
-%{python2_sitearch}/rhsm/*
+%{python_sitearch}/rhsm/*
 
 %if %{with python2_rhsm}
 %files -n python2-subscription-manager-rhsm
+%defattr(-,root,root,-)
 %dir %{python2_sitearch}/rhsm
 %{python2_sitearch}/rhsm/*
 %endif
@@ -967,6 +983,7 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 
 %if %use_cockpit
 %files -n subscription-manager-cockpit
+%defattr(-,root,root,-)
 %dir %{_datadir}/cockpit/subscription-manager
 %{_datadir}/cockpit/subscription-manager/index.html
 %{_datadir}/cockpit/subscription-manager/index.min.js.gz
@@ -978,6 +995,14 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
 %{_datadir}/metainfo/org.cockpit-project.subscription-manager.metainfo.xml
 %if ! %use_subman_gui
 %{_datadir}/applications/subscription-manager-cockpit.desktop
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%{_datadir}/icons/hicolor/24x24/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/96x96/apps/*.png
+%{_datadir}/icons/hicolor/256x256/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %endif
 %endif
 
@@ -1055,11 +1080,104 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.5-3
+* Fri Aug 03 2018 Christopher Snyder <csnyder@redhat.com> 1.23.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Integrate Syspurpose DBus Signal with Cockpit (aparadka@redhat.com)
+- Change usage_type to usage (csnyder@redhat.com)
+- ENT-715 Sync syspurpose with server (csnyder@redhat.com)
+- 1609052: DNF Plugin needs config initiated earlier (wpoteat@redhat.com)
+- 1608963: Minimize packaging for python 3 (wpoteat@redhat.com)
+- Improve test setup for syspurpose tests. (awood@redhat.com)
+- Two simple fixes for syspurpose (jhnidek@redhat.com)
+- Raise ioerr when necessary during sp read (csnyder@redhat.com)
+- ENT-720 Adds the addons subcommand (csnyder@redhat.com)
+- 1602056: Added role subcommand ENT-719 (jhnidek@redhat.com)
+- Replace lsb-release in spec and Makefile (khowell@redhat.com)
+- Mock out syspurpose code from being executed in subman tests
+  (csnyder@redhat.com)
+- ENT-584 syspurpose UTF-8 support & better formatting - All syspurpose
+  operations now support UTF-8 - syspurpose.json now has user-friendly
+  indentation (nmoumoul@redhat.com)
+- ENT-446 Report systempurpose on registration (csnyder@redhat.com)
+- 1512944: Fix up remaining python2 deps ENT-724 (csnyder@redhat.com)
+- ENT-721: Usage command (wpoteat@redhat.com)
+- ENT-590 Enhanced SyspurposeStore add/remove operations - 'add' will now not
+  override an existing value that was added by the 'set' command, but it will
+  be maintained and added in a list along with the newly added value. - 'add'
+  will now not add an element to a list if the list already contains it (no
+  duplicates). - 'remove' will now unset the current value, if that turns out
+  to be scalar instead of being contained in a list. (nmoumoul@redhat.com)
+- Move syspurpose out of packages directory. (awood@redhat.com)
+- Correct small problems in syspurpose. (awood@redhat.com)
+- ansible vagrant QOL fixes (khowell@redhat.com)
+- ENT-723: Add System Purpose Status to System Status output
+  (wpoteat@redhat.com)
+- Improve debug logging for release listing (khowell@redhat.com)
+- Remove other references to python-kitchen. (awood@redhat.com)
+- Make build_ext a proper dependency. (awood@redhat.com)
+- Add zanata.xml configuration file and gettext keys.pot (awood@redhat.com)
+- Move clean command to common build_ext module. (awood@redhat.com)
+- Only gather optparse strings in subscription-manager. (awood@redhat.com)
+- Move syspurpose source files to be under package directory.
+  (awood@redhat.com)
+- Look for source files based on package directory locations.
+  (awood@redhat.com)
+- Add gettext calls to syspurpose. (awood@redhat.com)
+- Load build_ext i18n commands in setup.py (awood@redhat.com)
+- Integrate Dbus signals with Cockpit GUI (aparadka@redhat.com)
+- Do not install subman-gui from setup.py by default (khowell@redhat.com)
+- ENT-591 Handle when syspurpose.json is missing & create it.
+  (nmoumoul@redhat.com)
+- Fix indeterminate unit test failure. (awood@redhat.com)
+- Removal of python-kitchen (wpoteat@redhat.com)
+- ENT-731 Replaced syspurpose 'offerings' commands with 'role': - Removed
+  commands 'add-offerings', 'remove-offerings', 'unset-offerings' - Added
+  commands 'set-role' and 'unset-role' (nmoumoul@redhat.com)
+- ENT-589 Intentctl -> syspurpose (csnyder@redhat.com)
+- ENT-710: Add three_way_merge utility function (csnyder@redhat.com)
+- ENT-477: Add signal EntitlementsChanged (aparadka@redhat.com)
+- ENT-476: Add signal InstalledProductsChanged (aparadka@redhat.com)
+- 1594733: Fix GetStatus in com.redhat.RHSM1.Entitlement ENT-641
+  (jhnidek@redhat.com)
+- Make vagrant setup more flexible (khowell@redhat.com)
+- ENT-475: Add signal ConfigChanged (aparadka@redhat.com)
+- 1581777: Reraise exception properly. ENT-566 (jhnidek@redhat.com)
+- Replace curly quote with straight quote (khowell@redhat.com)
+- Add implementation of filesystem watcher (aparadka@redhat.com)
+- 1581410: ENT-572: subman should require dnf-plugin-subscription-manager
+  (adarshvritant@gmail.com)
+- ENT-478 com.redhat.RHSM1.Consumer D-Bus service object (jhnidek@redhat.com)
+- 1576423: Polished changes provided in #1816 and added unit test.
+  (jhnidek@redhat.com)
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.21.5-2
+* Fri Jun 22 2018 Christopher Snyder <csnyder@redhat.com> 1.22.1-1
-- Rebuilt for Python 3.7
+- 1571998: Ignore HTB repos (nmoumoul@redhat.com)
+- 1589296: subman list option --after now named --afterdate
+  (aparadka@redhat.com)
+- 1558411: Begin building dnf-plugin-subscription-manager for RHEL 7
+  (csnyder@redhat.com)
+- Use constant defined in cerdirectory.py. (jhnidek@redhat.com)
+- 1553266: When d-bus methods are unavailable, show appropriate message. *
+  Added a "safe call" mechanism that makes the initial dbus calls
+  (entitlementService, configService, productsService) only if the service is
+  available, tries to restart the rhsm service if possible, and otherwise
+  failing gracefully. * Added new UI curtain that provides a meaningful message
+  and advice to the end user. * Re-added utility method statusUpdateFailed that
+  was accidentally deleted. (nmoumoul@redhat.com)
+- 1580996: Fix comparision of objects in Python 3 (ENT-578)
+  (jhnidek@redhat.com)
+- Make xauth Idempotent again (csnyder@redhat.com)
+- Fixes missing locale issues while running nosetests (csnyder@redhat.com)
+- Remove freezegun (khowell@redhat.com)
+- 1576582: Make rhsm.full_fresh_on_yum=1 working again (ENT-534)
+  (jhnidek@redhat.com)
+- ansible-fix: fixed ansible failing during vagrant up (aparadka@redhat.com)
+- Update the license of the subman-cockpit-plugin to GPLv2 (csnyder@redhat.com)
+- 1510920: Allow access to job cancellation API (wpoteat@redhat.com)
+- ENT-447 Add icons to RPM package for subman cockpit plugin
+  (jhnidek@redhat.com)
+
+* Fri Jun 08 2018 Christopher Snyder <csnyder@redhat.com> 1.22.0-1
+- Remove F26 from releasers (Fedora 26 EOL) (csnyder@redhat.com)
 
 * Thu Jun 07 2018 Christopher Snyder <csnyder@redhat.com> 1.21.5-1
 - Fix python-rhsm Provides and Obsoletes (csnyder@redhat.com)
@@ -1068,15 +1186,15 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
   (jhnidek@redhat.com)
 - ENT-447 Create .desktop file that opens web page with our cockpit plugin
   (jhnidek@redhat.com)
-- ENT-481 service-level command & options now update intent metadata
+- ENT-481 service-level command & options now update syspurpose metadata
   (nmoumoul@redhat.com)
 - 1560727: Search for proxy auth message in whole error string
   (aria.paradkar@gmail.com)
 - 1555384: get_libexecdir now returns a string instead of bytes
   (aria.paradkar@gmail.com)
-- Added generic set/unset and add/remove commands to intentctl
+- Added generic set/unset and add/remove commands to syspurpose
   (crog@redhat.com)
-- ENT-488 intentctl now warns if running in container (nmoumoul@redhat.com)
+- ENT-488 syspurpose now warns if running in container (nmoumoul@redhat.com)
 - 1574706: Create python2-subscription-manager-rhsm properly
   (jhnidek@redhat.com)
 - Automatic rebuilding of updates.img on PXE Server (jhnidek@redhat.com)
@@ -1103,7 +1221,7 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 - 1559227: Do not use str format for python 2.6 (csnyder@redhat.com)
 - 1425766: Additional message in status to indicate content access
   (wpoteat@redhat.com)
-- Adds a new cli utility 'intentctl' (csnyder@redhat.com)
+- Adds a new cli utility 'syspurpose' (csnyder@redhat.com)
 - 1559227: Do not log Error messages for missing identity cert/key
   (csnyder@redhat.com)
 - 1458159: python-dmidecode bug fix requires specific RPM release.