From 80086f3807ba1402de8f8c3c7091adda16be60ea Mon Sep 17 00:00:00 2001 From: Christopher Snyder Date: Thu, 11 Nov 2021 17:07:40 -0500 Subject: [PATCH] Update subscription-manager to 1.29.21-1 Resolves: #2022784 - Update to message formatting (wpoteat@redhat.com) Resolves: #1985845 - Fix sub-man service-level --show (jhnidek@redhat.com) Resolves: #2022793 - chmod /etc/pki/entitlement/*.pem only when existing Resolves: #2003777 - Fix organizations hint in syspurpose commands (mhorky@redhat.com) Resolves: #1989955 - use /proc/device-tree/ibm,partition-uuid on POWER LPARs Resolves: #2003777 - Only hint organizations if it's needed (mhorky@redhat.com) Resolves: #2003777 - Show available organizations before asking for input Resolves: #2022791 - Cockpit - do not show red red icon in SCA mode (jhnidek@redhat.com) Resolves: #2022786 - Display better error message on incorrect --org (mhorky@redhat.com) Resolves: #2022789 - list prints not status and dates in SCA mode (jhnidek@redhat.com) Resolves: #1983144 - More useful feedback on unknown argument (mhorky@redhat.com) Resolves: #2022792 - Remove invalid log level (mhorky@redhat.com) Resolves: #2022788 - Abort on invalid username/token option in syspurpose commands Resolves: #1922151 - Add /var/cache/cloud-what to python3-cloud-what RPM. Resolves: #1922151 - Use in-memory cache on AWS too (jhnidek@redhat.com) Resolves: #1984133 - repos: respect order of --enable & --disable (ptoscano@redhat.com) Resolves: #1974641 - Fix tab completion with multiple optional commands Resolves: #1876828 - Try to suppress errors in stderr when not run as root Resolves: #1977452 - typo in string format change Add quotes to a {filename} and remove Resolves: #1976240 - Improve HTTP code/message reporting in error strings --- .gitignore | 2 + sources | 4 +- subscription-manager-rpmlintrc | 16 - subscription-manager.spec | 978 +++++++++------------------------ 4 files changed, 268 insertions(+), 732 deletions(-) delete mode 100644 subscription-manager-rpmlintrc diff --git a/.gitignore b/.gitignore index bbba892..fe5cb29 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,5 @@ /subscription-manager-cockpit-1.29.17.tar.gz /subscription-manager-1.29.18.tar.gz /subscription-manager-cockpit-1.29.18.tar.gz +/subscription-manager-1.29.21.tar.gz +/subscription-manager-cockpit-1.29.21.tar.gz diff --git a/sources b/sources index 41de2bb..5d1eca6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.29.18.tar.gz) = 6cab0c04efd1dc35ee6eeeeb6febfc985c0e9dec40d2dc053c8f14e885dc5f163481636140d9eb1a03e80c0c6aff2fabde40dccd840654a1cd0ff4ee1c7e60bf -SHA512 (subscription-manager-cockpit-1.29.18.tar.gz) = a24a2fcb26721a4ba1047af85aa03079b37f8760edcd1eb7bcad243766b40fd8d546ae1018e3a20b0953034db4c3cd9c6bfbaef436da60b4b29d9e8ab3c93c51 +SHA512 (subscription-manager-1.29.21.tar.gz) = 02064b16d4db107b337f9d9e6fb530963143f69511ee3b3c72635aa23c6d7edaa338813747198ef09159f7aa0de04bbb86d225724e261a844e3e9e350853ed5a +SHA512 (subscription-manager-cockpit-1.29.21.tar.gz) = de5f182aaaad4e3c6adf14aeff03a952df45475a62440ecec253bbb51f9cc49750e1ceb406fbb731e1e6d2022edd3d983604a1e8671d8bebecd1e328179e7535 diff --git a/subscription-manager-rpmlintrc b/subscription-manager-rpmlintrc deleted file mode 100644 index 9714d45..0000000 --- a/subscription-manager-rpmlintrc +++ /dev/null @@ -1,16 +0,0 @@ -# This seems ok to me -addFilter('invalid-url') - -# All yum and dnf plugins seem to hardcode paths -addFilter("hardcoded-library-path .*lib/yum-plugins/.*") -addFilter("hardcoded-library-path .*lib/dnf-plugins/.*") - -# Filter out zypper plugins too! -addFilter("hardcoded-library-path .*lib/zypp/plugins/.*") - -# Systemd tmpfiles are in /usr/lib -addFilter("hardcoded-library-path .*lib/tmpfiles.d/.*") - -# Ignore failing suse specific checks -setBadness("suse-dbus-unauthorized-service", 0) -setBadness("polkit-unauthorized-privilege", 0) diff --git a/subscription-manager.spec b/subscription-manager.spec index 45a305c..514e880 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -1,130 +1,39 @@ -# Prefer systemd over sysv on Fedora and RHEL 7+ -%global use_systemd 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} && 0%{?suse_version} >= 1315) # For optional building of ostree-plugin sub package. Unrelated to systemd # but the same versions apply at the moment. -%global has_ostree %use_systemd && 0%{?suse_version} == 0 -%global use_initial_setup 1 -%global use_firstboot 0 +%global has_ostree 0%{?suse_version} == 0 %global use_inotify 1 -%global py2_package_prefix python2 -# Plugin for container (docker, podman) is not supported on RHEL 8 and higher -%if (0%{?rhel} && 0%{?rhel} >= 8) +# Plugin for container (docker, podman) is not supported on RHEL +%if 0%{?rhel} %global use_container_plugin 0 %else %global use_container_plugin 1 %endif -%if (0%{?rhel} >= 7 || 0%{?fedora}) +%if (0%{?rhel} || 0%{?fedora}) %global dmidecode_version >= 3.12.2-2 %endif -# We use the tmpfiles_create macro from systemd-rpm-macros rpm. -# Because of an incorrect version labelling of that rpm in SLES 12 which -# contains the necessary macro definition, we are not able to simply require -# a certain version of systemd-rpm-macros which will definitely contain this -# macro. To keep our SLES builds working we define the macro here for ourselves. -%if !0%{?tmpfiles_create:1} -%define tmpfiles_create() \ -[ -x /usr/bin/systemd-tmpfiles ] && \ - /usr/bin/systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \ -%{nil} -%endif - - -# borrowed from dnf spec file & tweaked -%if (0%{?rhel} && 0%{?rhel} <= 7) || 0%{?suse_version} -%bcond_with python3 -%else -%bcond_without python3 -%endif - -%if !(0%{?fedora} < 30 && %{with python3}) || 0%{?rhel} >= 8 -%bcond_with python2_rhsm -%else -%bcond_without python2_rhsm -%endif - -%if %{with python3} || 0%{?suse_version} -%global use_subman_gui 0 -%else -%global use_subman_gui 1 -%endif - -# Install subscription-manager-migration only for rhel8 and lower -%if 0%{?rhel} && 0%{?rhel} <= 8 -%global use_subscription_manager_migration 1 -%else -%global use_subscription_manager_migration 0 -%endif - -%if 0%{?suse_version} && 0%{?suse_version} < 1200 -%global completion_dir %{_sysconfdir}/bash_completion.d -%else %global completion_dir %{_datadir}/bash-completion/completions -%endif -%if 0%{?suse_version} > 1110 || 0%{?rhel} >= 7 || 0%{?fedora} %global run_dir /run -%else -%global run_dir /var/run -%endif %global rhsm_plugins_dir /usr/share/rhsm-plugins -# on recent Fedora and RHEL 7, let's not use m2crypto -%global use_m2crypto (0%{?fedora} < 23 && 0%{?rhel} < 7) - -%if %{use_systemd} -# Note that the global gtk3 will be undefined if it's not used -%global gtk3 1 -%endif - -%if 0%{?rhel} == 6 -%global use_initial_setup 0 -%global use_firstboot 1 -%global use_inotify 0 -%endif %if 0%{?suse_version} -%global use_initial_setup 0 -%global use_firstboot 0 -%global use_subman_gui 0 %global use_container_plugin 0 %global use_inotify 0 %endif -# Do not ship initial-setup in RHEL 9+ and Fedora: -# - as Anaconda can now register during the installation -# - it uses old Anaconda APIs that are not supported anymore -%if 0%{?rhel} >= 9 || 0%{?fedora} -%global use_initial_setup 0 -%endif +%global use_dnf (0%{?fedora} || (0%{?rhel})) +%global create_libdnf_rpm (0%{?fedora} || 0%{?rhel} > 8) +%global use_cockpit 0%{?fedora} || 0%{?rhel} -%if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot}) -%global use_rhsm_gtk 1 -%else -%global use_rhsm_gtk 0 -%endif - -%global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7) -%global create_libdnf_rpm (0%{?fedora} > 32 || 0%{?rhel} > 8) -%global use_yum (0%{?rhel} && 0%{?rhel} <= 7) -%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7 - -%if %{with python3} %global python_sitearch %python3_sitearch %global python_sitelib %python3_sitelib %global __python %__python3 %global py_package_prefix python%{python3_pkgversion} %global rhsm_package_name %{py_package_prefix}-subscription-manager-rhsm -%else -%if 0%{?suse_version} >= 1500 -%global py_package_prefix python2 -%else -%global py_package_prefix python -%endif -%global rhsm_package_name subscription-manager-rhsm -%endif %global _hardened_build 1 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now} @@ -141,26 +50,8 @@ %global install_container INSTALL_CONTAINER_PLUGIN=false %endif -# makefile will guess, but be specific. -%if 0%{?gtk3} -%global gtk_version GTK_VERSION=3 -%else -%global gtk_version GTK_VERSION=2 -%endif - -%if %{use_initial_setup} -%global post_boot_tool INSTALL_INITIAL_SETUP=true INSTALL_FIRSTBOOT=false -%else -%if %{use_firstboot} -%global post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=true -%else -%global post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=false -%endif -%endif - %if 0%{?suse_version} %global install_zypper_plugins INSTALL_ZYPPER_PLUGINS=true -%global post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=false %else %global install_zypper_plugins INSTALL_ZYPPER_PLUGINS=false %endif @@ -172,32 +63,9 @@ %global install_dnf_plugins INSTALL_DNF_PLUGINS=false %endif -# makefile defaults to INSTALL_YUM_PLUGINS=true -%if %{use_yum} -%global install_yum_plugins INSTALL_YUM_PLUGINS=true -%else -%global install_yum_plugins INSTALL_YUM_PLUGINS=false -%endif - -%if %{use_systemd} %global with_systemd WITH_SYSTEMD=true -%else -%global with_systemd WITH_SYSTEMD=false -%endif -%if %{use_subman_gui} -%global with_subman_gui WITH_SUBMAN_GUI=true -%else -%global with_subman_gui WITH_SUBMAN_GUI=false -%endif - -%if %{use_subscription_manager_migration} -%global with_subman_migration WITH_SUBMAN_MIGRATION=true -%else -%global with_subman_migration WITH_SUBMAN_MIGRATION=false -%endif - -%if %{use_cockpit} && !0%{use_subman_gui} +%if %{use_cockpit} %global with_cockpit WITH_COCKPIT=true %else %global with_cockpit WITH_COCKPIT=false @@ -225,30 +93,22 @@ # add new exclude packages items after me -%if !%{use_rhsm_gtk} -%global exclude_packages %{exclude_packages}subscription_manager.gui, -%endif - %if !%{use_container_plugin} %global exclude_packages %{exclude_packages}*.plugin.container, %endif -%if !%{use_subscription_manager_migration} -%global exclude_packages %{exclude_packages}subscription_manager.migrate, -%endif - # add new exclude_packages items before me %global exclude_packages %{exclude_packages}" # Moving our shared icon dependancies to their own package -# Both our cockpit plugin and the rhsm-gtk package require an overlapping -# set of icons. -%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} +# Cockpit plugin requires these icons. They are placed in separate package +# because they have been shared with subscription-manager-gui in RHEL < 9. +%global use_rhsm_icons 0%{use_cockpit} Name: subscription-manager -Version: 1.29.18 -Release: 2%{?dist} +Version: 1.29.21 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -270,13 +130,6 @@ Source0: %{name}-%{version}.tar.gz %if %{use_cockpit} Source1: %{name}-cockpit-%{version}.tar.gz %endif -%if (0%{?suse_version} && 0%{?suse_version} < 1500) -Source2: subscription-manager-rpmlintrc -%endif - -%if (0%{?suse_version} && 0%{?suse_version} < 1200) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%endif # The following macro examples are preceeded by '%' to stop macro expansion # in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for @@ -300,7 +153,7 @@ Requires: cron %endif Requires: %{rhsm_package_name} = %{version} Requires: %{py_package_prefix}-six -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} BuildRequires: %{py_package_prefix}-python-dateutil Requires: %{py_package_prefix}-python-dateutil %else @@ -315,15 +168,7 @@ Requires: platform-python-setuptools Requires: %{py_package_prefix}-setuptools %endif -%if %{with python3} Requires: python3-dbus -%else -Requires: %{?suse_version:dbus-1-python} %{!?suse_version:dbus-python} -%endif - -%if %{use_yum} -Requires: %{?suse_version:yum} %{!?suse_version:yum >= 3.2.29-73} -%endif %if %{use_dnf} %if %{create_libdnf_rpm} @@ -335,16 +180,11 @@ Requires: dnf-plugin-subscription-manager = %{version} %endif %endif -# Support GTK2 and GTK3 on both SUSE and RHEL... %if 0%{?suse_version} -Requires: %{?gtk3:python-gobject} %{!?gtk3:python-gobject2, libzypp, zypp-plugin-python, python-zypp} +Requires: python-gobject2, libzypp, zypp-plugin-python, python-zypp %else Requires: usermode -%if %{with python3} Requires: python3-gobject-base -%else -Requires: %{?gtk3:gobject-introspection, pygobject3-base} %{!?gtk3:pygobject2} -%endif # There's no dmi to read on these arches, so don't pull in this dep. # Additionally, dmidecode isn't packaged at all on SUSE %ifnarch aarch64 ppc ppc64 ppc64le s390 s390x @@ -356,15 +196,9 @@ Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} Requires: %{py_package_prefix}-inotify %endif -%if %use_systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%else -Requires: %{?suse_version:aaa_base} %{!?suse_version:chkconfig} -Requires(post): %{?suse_version:aaa_base} %{!?suse_version:chkconfig} -Requires(preun): %{?suse_version:aaa_base} %{!?suse_version:chkconfig, initscripts} -%endif Requires: python3-cloud-what = %{version}-%{release} @@ -377,45 +211,32 @@ BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: %{py_package_prefix}-six -%if %{use_subman_gui} || %{use_cockpit} +%if %{use_cockpit} BuildRequires: desktop-file-utils %endif -%if 0%{?suse_version} <= 1110 -BuildRequires: %{?suse_version:sles-release} %{!?suse_version:system-release} +%if 0%{?suse_version} +BuildRequires: distribution-release %else -BuildRequires: %{?suse_version:distribution-release} %{!?suse_version:system-release} +BuildRequires: system-release %endif %if 0%{?suse_version} BuildRequires: libzypp %endif -%if %{use_subman_gui} -BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel} -BuildRequires: %{?suse_version:update-desktop-files} %{!?suse_version:scrollkeeper} -BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel} -BuildRequires: %{?gtk3:gtk3-devel} %{!?gtk3:gtk2-devel} -%endif - -%if %use_systemd # We need the systemd RPM macros -%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif BuildRequires: systemd -%endif -%if !%{use_initial_setup} Obsoletes: subscription-manager-initial-setup-addon <= %{version}-%{release} -%endif -%if !%{use_rhsm_gtk} Obsoletes: rhsm-gtk <= %{version}-%{release} -%endif %if !%{use_container_plugin} -Obsoletes: subscription-manager-plugin-container +Obsoletes: subscription-manager-plugin-container <= %{version} %endif %if %{use_dnf} @@ -429,7 +250,7 @@ Obsoletes: dnf-plugin-subscription-manager < 1.29.0 %endif %endif -Obsoletes: %{py_package_prefix}-syspurpose +Obsoletes: %{py_package_prefix}-syspurpose <= %{version} %description The Subscription Manager package provides programs and libraries to allow users @@ -452,86 +273,6 @@ Enables handling of content of type 'containerImage' in any certificates from the server. Populates /etc/docker/certs.d appropriately. %endif -%if %{use_rhsm_gtk} -%package -n rhsm-gtk -Summary: GTK+ widgets used by subscription-manager-gui and initial_setup -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -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 -Requires: librsvg2%{?_isa} -Requires: rhsm-icons - -%if 0%{?gtk3} -Requires: font(cantarell) -%else -Requires: %{?suse_version:dejavu} %{!?suse_version:dejavu-sans-fonts} -%endif - - -%description -n rhsm-gtk -This package contains GUI and widgets used by subscription-manager-gui -and RHSM initial_setup module for Anaconda. -%endif - -%if %{use_subman_gui} -%package -n subscription-manager-gui -Summary: A GUI interface to manage Red Hat product subscriptions -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -Requires: %{name} = %{version}-%{release} -Requires: gnome-icon-theme - -# We need pygtk3 and gtk2 until rhsm-icon is ported to gtk3 -Requires: rhsm-gtk = %{version}-%{release} - -# Renamed from -gnome, so obsolete it properly -Obsoletes: %{name}-gnome < 1.0.3-1 -Provides: %{name}-gnome = %{version}-%{release} - -%if !0%{?suse_version} -Requires(post): scrollkeeper -Requires(postun): scrollkeeper -%else -%endif - -%description -n subscription-manager-gui -This package contains a GTK+ graphical interface for configuring and -registering a system with a Red Hat Entitlement platform and manage -subscriptions. -%endif - - -%if %{use_subscription_manager_migration} -%package -n subscription-manager-migration -Summary: Migration scripts for moving to certificate based subscriptions -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -Requires: %{name} = %{version}-%{release} -Requires: rhnlib - -# Since the migration data package is not in Fedora, we can only require it -# on RHEL. -%if 0%{?rhel} -Requires: subscription-manager-migration-data -%endif - -%description -n subscription-manager-migration -This package contains scripts that aid in moving to certificate based -subscriptions -%endif - %if %{use_dnf} # RPM containing libdnf plugin @@ -570,7 +311,7 @@ Group: Productivity/Networking/System Group: System Environment/Base %endif -%if (0%{?fedora} >= 29 || 0%{?rhel} >= 8) +%if (0%{?fedora} || 0%{?rhel}) BuildRequires: cmake BuildRequires: gcc BuildRequires: json-c-devel @@ -579,27 +320,9 @@ Requires: json-c Requires: libdnf >= 0.22.5 %endif -# See BZ 1581410 - avoid a circular dependency -%if (0%{?rhel} < 8 || 0%{?fedora} < 29) -Requires: %{name} >= %{version}-%{release} -%endif - -%if %{with python3} - Requires: python3-dnf-plugins-core Requires: python3-librepo -%else - -Requires: python2-dnf-plugins-core -%if (0%{?rhel} == 7) -Requires: python-librepo -%else -Requires: python2-librepo -%endif - -%endif - Requires: dnf >= 1.0.0 %description -n dnf-plugin-subscription-manager This package provides plugins to interact with repositories and subscriptions @@ -623,44 +346,6 @@ package or when debugging this package. %endif -%if %use_firstboot -%package -n subscription-manager-firstboot -Summary: Firstboot screens for subscription manager -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -Requires: rhsm-gtk = %{version}-%{release} -Requires: rhn-setup-gnome - -# Fedora can figure this out automatically, but RHEL cannot: -Requires: librsvg2 - -%description -n subscription-manager-firstboot -This package contains the firstboot screens for subscription-manager. -%endif - - -%if %use_initial_setup -%package -n subscription-manager-initial-setup-addon -Summary: initial-setup screens for subscription-manager -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -Requires: rhsm-gtk = %{version}-%{release} -Requires: initial-setup-gui >= 0.3.9.24-1 -Obsoletes: subscription-manager-firstboot < 1.15.3-1 -%if (0%{?rhel} >= 8) -Supplements: initial-setup-gui -%endif - -%description -n subscription-manager-initial-setup-addon -This package contains the initial-setup screens for subscription-manager. -%endif - %if %has_ostree %package -n subscription-manager-plugin-ostree Summary: A plugin for handling OSTree content. @@ -690,32 +375,22 @@ Group: Development/Libraries/Python Group: Development/Libraries %endif -%if %use_m2crypto -Requires: %{?suse_version:python-m2crypto} %{!?suse_version:m2crypto} -%endif -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} Requires: %{py_package_prefix}-python-dateutil %else Requires: %{py_package_prefix}-dateutil %endif Requires: %{py_package_prefix}-iniparse -# rpm-python is an old name for python2-rpm but RHEL6 uses the old name Requires: %{py_package_prefix}-six Requires: subscription-manager-rhsm-certificates = %{version}-%{release} # Required by Fedora packaging guidelines %{?python_provide:%python_provide %{py_package_prefix}-rhsm} -%if %{with python3} Requires: python3-cloud-what = %{version}-%{release} Requires: python3-rpm Provides: python3-rhsm = %{version}-%{release} Obsoletes: python3-rhsm <= 1.20.3-1 Provides: python-rhsm = %{version}-%{release} Obsoletes: python-rhsm <= 1.20.3-1 -%else -Requires: rpm-python -Provides: python-rhsm = %{version}-%{release} -Obsoletes: python-rhsm <= 1.20.3-1 -%endif %description -n %{rhsm_package_name} A small library for communicating with the REST interface of a Red Hat Unified @@ -723,37 +398,6 @@ Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. -%if %{with python2_rhsm} -%package -n python2-subscription-manager-rhsm -Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform -%if 0%{?suse_version} -Group: Development/Libraries/Python -%else -Group: Development/Libraries -%endif - -BuildRequires: python2-devel - -%if %use_m2crypto -Requires: %{?suse_version:python-m2crypto} %{!?suse_version:m2crypto} -%endif -Requires: %{py2_package_prefix}-dateutil -Requires: %{py2_package_prefix}-iniparse -# rpm-python is an old name for python2-rpm but RHEL6 uses the old name -Requires: %{py2_package_prefix}-six -Requires: subscription-manager-rhsm-certificates = %{version}-%{release} -# Required by Fedora packaging guidelines -%{?python_provide:%python_provide %{py2_package_prefix}-rhsm} -Requires: rpm-python -Provides: python-rhsm = %{version}-%{release} -Obsoletes: python-rhsm <= 1.20.3-1 - -%description -n python2-subscription-manager-rhsm -A small library for communicating with the REST interface of a Red Hat Unified -Entitlement Platform. This interface is used for the management of system -entitlements, certificates, and access to content. -%endif - %package -n subscription-manager-rhsm-certificates Summary: Certificates required to communicate with a Red Hat Unified Entitlement Platform %if 0%{?suse_version} @@ -803,14 +447,18 @@ Conflicts: subscription-manager-cockpit < 1.26.7 %description -n rhsm-icons This package contains the desktop icons for the graphical interfaces provided for management -of Red Hat subscriptions. There are many such interfaces, subscription-manager-gui, -subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily. +of Red Hat subscriptions: subscription-manager-gui, subscription-manager-cockpit-plugin. %endif %package -n python3-cloud-what Summary: Python package for detection of public cloud provider +%if 0%{?suse_version} +Group: Productivity/Networking/System +License: GPL-2.0 +%else License: GPLv2 +%endif Requires: python3-requests %ifnarch aarch64 ppc ppc64 ppc64le s390 s390x Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} @@ -827,15 +475,10 @@ cloud metadata and signatures. %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ - %{?gtk_version} %{?subpackages} \ - %{exclude_packages} %{?with_subman_gui} %{?with_subman_migration} - -%if %{with python2_rhsm} -python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release} -%endif + %{?subpackages} %{exclude_packages} %if %{use_dnf} -pushd src/dnf-plugins/product-id +pushd src/plugins/libdnf %cmake -DCMAKE_BUILD_TYPE="Release" %if (0%{?rhel} && 0%{?rhel} <= 8) %make_build @@ -852,18 +495,16 @@ make -f Makefile install VERSION=%{version}-%{release} \ OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \ COMPLETION_DIR=%{completion_dir} \ RUN_DIR=%{run_dir} \ - %{?install_ostree} %{?install_container} %{?post_boot_tool} %{?gtk_version} \ - %{?install_yum_plugins} %{?install_dnf_plugins} \ + %{?install_ostree} %{?install_container} \ + %{?install_dnf_plugins} \ %{?install_zypper_plugins} \ %{?with_systemd} \ - %{?with_subman_gui} \ - %{?with_subman_migration} \ %{?with_cockpit} \ %{?subpackages} \ %{?exclude_packages} %if %{use_dnf} -pushd src/dnf-plugins/product-id +pushd src/plugins/libdnf mkdir -p %{buildroot}%{_libdir}/libdnf/plugins %if (0%{?rhel} && 0%{?rhel} <= 8) %make_install @@ -873,35 +514,14 @@ mkdir -p %{buildroot}%{_libdir}/libdnf/plugins popd %endif -%if %{with python2_rhsm} -mkdir -p %{buildroot}%{python2_sitearch}/rhsm -# Build binary extension in Python2 site-packages directory -python2 ./setup.py build_ext --build-lib %{buildroot}%{python2_sitearch} --quiet -# Copy all *.py file from Python3 to Python2 directory -cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm/ -%endif - -%if 0%{?suse_version} -%if %use_subman_gui -%suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager -%endif -%endif - -%if %use_subman_gui -desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop -desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop -%else - %if %use_cockpit desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-cockpit.desktop %endif -%endif - %find_lang rhsm # fake out the redhat.repo file -%if %{use_yum} || %{use_dnf} +%if %{use_dnf} mkdir %{buildroot}%{_sysconfdir}/yum.repos.d touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo %endif @@ -929,20 +549,13 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/ # fix timestamps on our byte compiled files so they match across arches find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; -%if %{with python3} %py_byte_compile %{__python3} %{buildroot}%{rhsm_plugins_dir}/ -%py_byte_compile %{__python3} %{buildroot}%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ -%endif # symlink services to /usr/sbin/ when building for SUSE distributions %if 0%{?suse_version} - %if %{use_systemd} - ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsm - ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsm-facts - ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsmcertd - %else - ln -s %{_initrddir}/rhsmcertd %{buildroot}%{_sbindir}/rcrhsmcertd - %endif + ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsm + ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsm-facts + ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcrhsmcertd %endif # base/cli tools use the gettext domain 'rhsm', while the @@ -955,13 +568,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %dir %{_sysconfdir}/pki %dir %{_prefix}/share/polkit-1 %dir %{_prefix}/share/polkit-1/actions - -# Suse specific -%if %{use_yum} - %dir %{_sysconfdir}/yum - %dir %{_sysconfdir}/yum/pluginconf.d - %dir %{_prefix}/lib/yum-plugins/ -%endif +%dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/system.d # Suse specific %if %{use_dnf} @@ -971,14 +579,13 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif # Suse specific -%if %{use_yum} || %{use_dnf} +%if %{use_dnf} %dir %{_sysconfdir}/yum.repos.d %endif %endif %dir %{python_sitearch}/rhsmlib/candlepin -%dir %{python_sitearch}/rhsmlib/compat %dir %{python_sitearch}/rhsmlib/dbus %dir %{python_sitearch}/rhsmlib/dbus/facts %dir %{python_sitearch}/rhsmlib/dbus/objects @@ -993,11 +600,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %dir %{python_sitearch}/subscription_manager/scripts %dir %{_var}/spool/rhsm -%if 0%{?suse_version} && 0%{?suse_version} < 1315 -%dir %{_prefix}/share/locale/ta_IN -%dir %{_prefix}/share/locale/ta_IN/LC_MESSAGES -%endif - %attr(755,root,root) %{_sbindir}/subscription-manager # symlink to console-helper @@ -1023,7 +625,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf -%config %attr(644,root,root) %{_sysconfdir}/rhsm/logging.conf %if 0%{?suse_version} %attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/zypper.conf @@ -1035,18 +636,10 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_sysconfdir}/security/console.apps/subscription-manager %endif -%if %{use_yum} || %{use_dnf} +%if %{use_dnf} %ghost %{_sysconfdir}/yum.repos.d/redhat.repo %endif -# yum plugin config -%if %{use_yum} - # remove the repo file when we are deleted - %config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/subscription-manager.conf - %config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/product-id.conf - %config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/search-disabled-repos.conf -%endif - # dnf plugin config %if %{use_dnf} # remove the repo file when we are deleted @@ -1071,14 +664,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{completion_dir}/rhsm-debug %{completion_dir}/rhsmcertd -%if %{use_subscription_manager_migration} -%{completion_dir}/rhn-migrate-classic-to-rhsm -%endif - -%if %use_subman_gui -%{completion_dir}/rhsm-icon -%endif - %dir %{python_sitearch}/subscription_manager # code, python modules and packages @@ -1090,7 +675,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{python_sitearch}/subscription_manager/model/*.py* %{python_sitearch}/subscription_manager/plugin/__init__.py* %{python_sitearch}/subscription_manager/scripts/*.py* -%if %{with python3} %{python_sitearch}/subscription_manager/__pycache__ %{python_sitearch}/subscription_manager/api/__pycache__ %{python_sitearch}/subscription_manager/branding/__pycache__ @@ -1098,35 +682,11 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{python_sitearch}/subscription_manager/model/__pycache__ %{python_sitearch}/subscription_manager/plugin/__pycache__ %{python_sitearch}/subscription_manager/scripts/__pycache__ -%endif - -# our gtk2/gtk3 compat modules -%dir %{python_sitearch}/subscription_manager/ga_impls -%{python_sitearch}/subscription_manager/ga_impls/__init__.py* -%if %{with python3} -%{python_sitearch}/subscription_manager/ga_impls/__pycache__ -%endif - -%if 0%{?gtk3} -%{python_sitearch}/subscription_manager/ga_impls/ga_gtk3.py* -%else -%dir %{python_sitearch}/subscription_manager/ga_impls/ga_gtk2 -%{python_sitearch}/subscription_manager/ga_impls/ga_gtk2/*.py* -%endif # subscription-manager plugins %dir %{rhsm_plugins_dir} %dir %{_sysconfdir}/rhsm/pluginconf.d -# 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/: -%if %{use_yum} - %{_prefix}/lib/yum-plugins/subscription-manager.py* - %{_prefix}/lib/yum-plugins/product-id.py* - %{_prefix}/lib/yum-plugins/search-disabled-repos.py* -%endif - # When libdnf rpm is created, then dnf plugin is part of subscription-manager rpm %if %{create_libdnf_rpm} %{python_sitelib}/dnf-plugins/* @@ -1141,29 +701,23 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %dir %{python_sitearch}/rhsmlib %{python_sitearch}/rhsmlib/*.py* %{python_sitearch}/rhsmlib/candlepin/*.py* -%{python_sitearch}/rhsmlib/compat/*.py* %{python_sitearch}/rhsmlib/facts/*.py* %{python_sitearch}/rhsmlib/services/*.py* %{python_sitearch}/rhsmlib/dbus/*.py* %{python_sitearch}/rhsmlib/dbus/facts/*.py* %{python_sitearch}/rhsmlib/dbus/objects/*.py* -%if %{with python3} %{python_sitearch}/rhsmlib/__pycache__ %{python_sitearch}/rhsmlib/candlepin/__pycache__ -%{python_sitearch}/rhsmlib/compat/__pycache__ %{python_sitearch}/rhsmlib/dbus/__pycache__ %{python_sitearch}/rhsmlib/dbus/facts/__pycache__ %{python_sitearch}/rhsmlib/dbus/objects/__pycache__ %{python_sitearch}/rhsmlib/facts/__pycache__ %{python_sitearch}/rhsmlib/services/__pycache__ -%endif # syspurpose %dir %{python_sitearch}/syspurpose -%{python_sitearch}/syspurpose/*.py -%if %{with python3} +%{python_sitearch}/syspurpose/*.py* %{python_sitearch}/syspurpose/__pycache__ -%endif %{_datadir}/polkit-1/actions/com.redhat.*.policy %{_datadir}/dbus-1/system-services/com.redhat.*.service @@ -1171,15 +725,11 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; # 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 - %if 0%{?suse_version} - %{_sbindir}/rcrhsm - %{_sbindir}/rcrhsm-facts - %endif -%else - %attr(755,root,root) %{_initrddir}/rhsmcertd +%attr(644,root,root) %{_unitdir}/*.service +%attr(644,root,root) %{_tmpfilesdir}/%{name}.conf +%if 0%{?suse_version} + %{_sbindir}/rcrhsm + %{_sbindir}/rcrhsm-facts %endif %if 0%{?suse_version} @@ -1189,17 +739,13 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; # Incude rt CLI tool %dir %{python_sitearch}/rct %{python_sitearch}/rct/*.py* -%if %{with python3} %{python_sitearch}/rct/__pycache__ -%endif %attr(755,root,root) %{_bindir}/rct # Include consumer debug CLI tool %dir %{python_sitearch}/rhsm_debug %{python_sitearch}/rhsm_debug/*.py* -%if %{with python3} %{python_sitearch}/rhsm_debug/__pycache__ -%endif %attr(755,root,root) %{_bindir}/rhsm-debug %doc @@ -1210,106 +756,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_mandir}/man5/rhsm.conf.5* %doc LICENSE - -%if %{use_rhsm_gtk} -%files -n rhsm-gtk -%defattr(-,root,root,-) -%dir %{python_sitearch}/subscription_manager/gui -%{python_sitearch}/subscription_manager/gui/*.py* -%{python_sitearch}/subscription_manager/gui/data/ui/*.ui -%{python_sitearch}/subscription_manager/gui/data/glade/*.glade -%{python_sitearch}/subscription_manager/gui/data/icons/*.svg -%if %{with python3} -%{python_sitearch}/subscription_manager/gui/__pycache__ -%endif -%endif - -%if %{use_subman_gui} -%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 -%dir %{python_sitearch}/subscription_manager/gui/data/glade -%dir %{python_sitearch}/subscription_manager/gui/data/icons -%dir %{python_sitearch}/subscription_manager/gui/data/ui -%dir %{_datadir}/appdata -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help -%dir %{_datadir}/gnome/help/subscription-manager -%dir %{_datadir}/gnome/help/subscription-manager/C -%dir %{_datadir}/gnome/help/subscription-manager/C/figures -%dir %{_datadir}/omf -%dir %{_datadir}/omf/subscription-manager -%else -# symlink to console-helper -%{_bindir}/subscription-manager-gui -%endif - -%{_bindir}/rhsm-icon - -%doc %{_datadir}/gnome/help/subscription-manager/C/figures/*.png -%doc %{_datadir}/gnome/help/subscription-manager/C/*.xml -%{_datadir}/omf/subscription-manager/subscription-manager-C.omf - -%{_datadir}/applications/subscription-manager-gui.desktop -%{_datadir}/appdata/subscription-manager-gui.appdata.xml - -# desktop config files -%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop -%if !0%{?suse_version} -%{_sysconfdir}/pam.d/subscription-manager-gui -%{_sysconfdir}/security/console.apps/subscription-manager-gui -%endif - -%{completion_dir}/subscription-manager-gui - -%doc -%{_mandir}/man8/subscription-manager-gui.8* -%{_mandir}/man8/rhsm-icon.8* -%doc LICENSE -%endif - - -%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* -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/*.ui -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/*.py* -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/*.py* -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/*.py* -%if %{with python3} -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/__pycache__ -%endif - -%endif - -%if 0%{?use_subscription_manager_migration} -%files -n subscription-manager-migration -%defattr(-,root,root,-) -%dir %{python_sitearch}/subscription_manager/migrate -%{python_sitearch}/subscription_manager/migrate/*.py* -%if %{with python3} -%{python_sitearch}/subscription_manager/migrate/__pycache__ -%endif -%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm - -%doc -%{_mandir}/man8/rhn-migrate-classic-to-rhsm.8* -%doc LICENSE -%if 0%{?fedora} -%doc README.Fedora -%endif -%endif - %if %{use_container_plugin} %files -n subscription-manager-plugin-container %defattr(-,root,root,-) @@ -1321,10 +767,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf %{rhsm_plugins_dir}/container_content.py* -%if %{with python3} %{rhsm_plugins_dir}/__pycache__/*container* %{python_sitearch}/subscription_manager/plugin/container/__pycache__ -%endif %{python_sitearch}/subscription_manager/plugin/container/*.py* # Copying Red Hat CA cert into each directory: @@ -1338,25 +782,9 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf %{rhsm_plugins_dir}/ostree_content.py* %{python_sitearch}/subscription_manager/plugin/ostree/*.py* -%if %{with python3} %{python_sitearch}/subscription_manager/plugin/ostree/__pycache__ %{rhsm_plugins_dir}/__pycache__/*ostree* %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} @@ -1380,22 +808,14 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %dir %{python_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 - %files -n python3-cloud-what %defattr(-,root,root,-) +%attr(750,root,root) %dir %{_var}/cache/cloud-what %dir %{python_sitearch}/cloud_what %dir %{python_sitearch}/cloud_what/providers %{python_sitearch}/cloud_what/* -%if %{with python3} %{python_sitearch}/cloud_what/__pycache__ %{python_sitearch}/cloud_what/providers/__pycache__ -%endif %files -n subscription-manager-rhsm-certificates %attr(755,root,root) %dir %{_sysconfdir}/rhsm @@ -1415,10 +835,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_datadir}/cockpit/subscription-manager/po.*.js %{_datadir}/cockpit/subscription-manager/po.js %{_datadir}/metainfo/org.candlepinproject.subscription_manager.metainfo.xml -%if ! %use_subman_gui %{_datadir}/applications/subscription-manager-cockpit.desktop %endif -%endif %if %use_rhsm_icons %files -n rhsm-icons @@ -1430,61 +848,38 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %pre -%if %use_systemd - %if 0%{?suse_version} - %service_add_pre rhsm.service - %service_add_pre rhsm-facts.service - %service_add_pre rhsmcertd.service - %endif +%if 0%{?suse_version} + %service_add_pre rhsm.service + %service_add_pre rhsm-facts.service + %service_add_pre rhsmcertd.service %endif %post -%if %use_systemd - %if 0%{?suse_version} - %service_add_post rhsmcertd.service - %service_add_post rhsm.service - %service_add_post rhsm-facts.service - %tmpfiles_create %{_tmpfilesdir}/subscription-manager.conf - %else - %systemd_post rhsmcertd.service - %endif +%if 0%{?suse_version} + %service_add_post rhsmcertd.service + %service_add_post rhsm.service + %service_add_post rhsm-facts.service + %tmpfiles_create %{_tmpfilesdir}/subscription-manager.conf %else - %if 0%{?suse_version} - %fillup_and_insserv -f rhsmcertd - %else - chkconfig --add rhsmcertd - %endif + %systemd_post rhsmcertd.service %endif # When subscription-manager is upgraded on RHEL 8 (from RHEL 8.2 to RHEL 8.3), then kill # instance of rhsmd, because it is not necessary anymore and it can cause issues. # See: https://bugzilla.redhat.com/show_bug.cgi?id=1840364 -%if ( 0%{?rhel} >= 8 || 0%{?fedora} ) +%if ( 0%{?rhel} || 0%{?fedora} ) if [ "$1" = "2" ] ; then killall rhsmd 2> /dev/null || true fi %endif # Make all entitlement certificates and keys files readable by group and other -chmod go+r /etc/pki/entitlement/*.pem || true +find /etc/pki/entitlement -mindepth 1 -maxdepth 1 -name '*.pem' | xargs --no-run-if-empty chmod go+r if [ -x /bin/dbus-send ] ; then dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : fi -%if !%use_systemd -if [ "$1" = "2" ] ; then - /sbin/service rhsmcertd condrestart >/dev/null 2>&1 || : -fi -%endif - -%if %{use_subman_gui} -%post -n subscription-manager-gui -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%if !0%{?suse_version} -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : -%endif -%endif %if !0%{?suse_version} %if %{use_container_plugin} @@ -1495,21 +890,12 @@ scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %preun if [ $1 -eq 0 ] ; then - %if %use_systemd - %if 0%{?suse_version} - %service_del_preun rhsm.service - %service_del_preun rhsm-facts.service - %service_del_preun rhsmcertd.service - %else - %systemd_preun rhsmcertd.service - %endif + %if 0%{?suse_version} + %service_del_preun rhsm.service + %service_del_preun rhsm-facts.service + %service_del_preun rhsmcertd.service %else - %if 0%{?suse_version} - %stop_on_removal %{_initrddir}/rhsmcertd - %else - /sbin/service rhsmcertd stop >/dev/null 2>&1 - /sbin/chkconfig --del rhsmcertd - %endif + %systemd_preun rhsmcertd.service %endif if [ -x /bin/dbus-send ] ; then @@ -1518,18 +904,12 @@ if [ $1 -eq 0 ] ; then fi %postun -%if %use_systemd - %if 0%{?suse_version} - %service_del_postun rhsmcertd.service - %service_del_postun rhsm.service - %service_del_postun rhsm-facts.service - %else - %systemd_postun_with_restart rhsmcertd.service - %endif +%if 0%{?suse_version} + %service_del_postun rhsmcertd.service + %service_del_postun rhsm.service + %service_del_postun rhsm-facts.service %else - %if 0%{?suse_version} - %insserv_cleanup %{_initrddir}/rhsmcertd - %endif + %systemd_postun_with_restart rhsmcertd.service %endif %posttrans @@ -1537,30 +917,200 @@ fi # due to this BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1927245 rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-empty -%if %{use_subman_gui} -%postun -n subscription-manager-gui -if [ $1 -eq 0 ] ; then - %if (0%{?fedora} < 30 || 0%{?rhel} < 8) - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %endif - - %if !0%{?suse_version} - scrollkeeper-update -q || : - %endif -fi -%posttrans -n subscription-manager-gui -%if (0%{?fedora} < 30 || 0%{?rhel} < 8) -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : -%endif - -%endif %changelog -* Tue Aug 10 2021 Mohan Boddu - 1.29.18-2 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Thu Nov 11 2021 Christopher Snyder 1.29.21-1 +- 2020248: handle server-side consumer deletion in syspurpose commands + (ptoscano@redhat.com) +- connection: recognize proxy errors (ptoscano@redhat.com) + +* Thu Nov 11 2021 Christopher Snyder 1.29.20-1 +- ENT-4279: Switch away from rhsmlib.compat.subprocess_compat + (mhorky@redhat.com) +- 2021578: Remove proxy server test as it is unnecessary (wpoteat@redhat.com) +- cockpit: validate SSL connection to mock-insights (ptoscano@redhat.com) +- cockpit: fix hostname of the fake Insights server (ptoscano@redhat.com) +- cockpit: validate the SSL connection to candlepin (ptoscano@redhat.com) +- cockpit: resolve hostname of service machine (ptoscano@redhat.com) +- cockpit: use CANDLEPIN_URL consistently (ptoscano@redhat.com) +- 1719690: Update to message formatting (wpoteat@redhat.com) +- cockpit: account for missing insights-client on non-RHEL systems + (ptoscano@redhat.com) +- cockpit: skip Insights tests on non-RHEL OSes (ptoscano@redhat.com) +- ENT-4370: Drop old dbus_interface.py (mhorky@redhat.com) +- ENT-4278: Drop unittest2 imports (mhorky@redhat.com) +- 1985845: Fix sub-man service-level --show (jhnidek@redhat.com) +- spec: drop non-systemd support (ptoscano@redhat.com) +- spec: drop support for Python < 3 (ptoscano@redhat.com) +- spec: drop support for Fedora < 33 (ptoscano@redhat.com) +- spec: drop support for RHEL < 8 (ptoscano@redhat.com) +- spec: drop support for SUSE < 15 (ptoscano@redhat.com) +- 2015173: chmod /etc/pki/entitlement/*.pem only when existing + (ptoscano@redhat.com) +- cockpit: port subscriptions info icons to PF4 icons (kkoukiou@redhat.com) +- cockpit: translate some untranslated aria-labels (kkoukiou@redhat.com) +- cockpit: Port Po2JSONPlugin to webpack 5 (kkoukiou@redhat.com) +- cockpit: stop including PF3 - it's not used anymore (kkoukiou@redhat.com) +- cockpit: port Insights dialog remaining non PF4 parts (kkoukiou@redhat.com) +- cockpit: port subscriptions register dialog to Patternfly 4 + (kkoukiou@redhat.com) +- cockpit: make default TEST_OS rhel-8-4 (kkoukiou@redhat.com) +- cockpit: port spinners to PF4 spinners (kkoukiou@redhat.com) +- cockpit: replace custom Revealer component with 'ExpandableSection' from PF4 + (kkoukiou@redhat.com) +- cockpit: replace pficon and fa classes with svgs form react-icons + (kkoukiou@redhat.com) +- cockpit: remove jquery unused dependency (kkoukiou@redhat.com) +- cockpit: patternfly is a normal dependency - not just dev + (kkoukiou@redhat.com) +- cockpit: update patternfly modules and explicitely specify react-icons + dependency (kkoukiou@redhat.com) +- cockpit: clean up package.json from unused dependencies and move to webpack 5 + (kkoukiou@redhat.com) +- webpack: Use relative resolve path for npm 7 compatibility + (kkoukiou@redhat.com) +- cockpit: Stop using a custom Select, use the one from PF instead + (kkoukiou@redhat.com) +- cockpit: checkout Cockpit's PF/React/build library instead of keeping a + direct copy of it locally (kkoukiou@redhat.com) +- cockpit: update npmshrinkwrap file (kkoukiou@redhat.com) +- Use pytest --forked for D-Bus unit tests (jhnidek@redhat.com) +- Support of python3 of zypper rhsm script (suttner@atix.de) +- 2003777: Fix organizations hint in syspurpose commands (mhorky@redhat.com) +- Small style changes of d-bus server and d-bus unit tests (jhnidek@redhat.com) +- * Removed GLib.threads_init() (jhnidek@redhat.com) +- Added cleanup for one patcher; fixed some comments. (jhnidek@redhat.com) +- cockpit: skip RHEL 9 tests using insights-client (ptoscano@redhat.com) +- cockpit: fix system installation of subscription-manager + (ptoscano@redhat.com) +- cockpit: wait 5 seconds for candlepin at first (ptoscano@redhat.com) +- cockpit: use the self-signed key in mock-insights (ptoscano@redhat.com) +- test: Building requires gcc (mmarusak@redhat.com) +- test: Tell tests about rhel-9 package manager (mmarusak@redhat.com) +- facts: drop dead/unused code from CleanupCollector (ptoscano@redhat.com) +- 1989955: use /proc/device-tree/ibm,partition-uuid on POWER LPARs + (ptoscano@redhat.com) +- facts: prepare _get_devicetree_uuid() for multiple files + (ptoscano@redhat.com) +- facts: refactor device-tree parts of VirtUuidCollector (ptoscano@redhat.com) +- cockpit: Move from obsolete node-sass to Dart sass (martin@piware.de) +- Cloud-what: Make saving token file more robust (jhnidek@redhat.com) +- Fix redundant API calls to Candlepin (hyu@redhat.com) +- Remove i-notify watchers on the end of the loop (jhnidek@redhat.com) +- build: pin flake8 to < 4 (ptoscano@redhat.com) +- Only rpmlint our specfiles (csnyder@redhat.com) +- Version our obsoletes of syspurpose and the container plugin + (csnyder@redhat.com) +- Remove unnecessary comment and sles/suse tests (csnyder@redhat.com) +- ENT-4273: Drop usage of six.moves (mhorky@redhat.com) +- ENT-4379: Remove function make_utf8 (mhorky@redhat.com) +- ENT-4087: Fix flake8 error E722 (mhorky@redhat.com) +- make spec file SUSE / Open Build Service compliant (p.seiler@linuxmail.org) +- 2003777: Only hint organizations if it's needed (mhorky@redhat.com) +- Drop old GUI docs leftovers (ptoscano@redhat.com) +- tests: drop no more needed rhsm_display (ptoscano@redhat.com) +- build: remove old specific check for GUI file (ptoscano@redhat.com) +- Drop async_utils & its tests (ptoscano@redhat.com) +- Remove rhsm-icon leftovers (ptoscano@redhat.com) +- build: remove unused detect_overindent function (ptoscano@redhat.com) +- build: drop lxml leftovers (ptoscano@redhat.com) +- build: drop Glade leftovers (ptoscano@redhat.com) +- Add rhsm proxy support to apt-transport-katello (suttner@atix.de) +- ENT-4289: Drop Sphinx (mhorky@redhat.com) +- ENT-4340: Resolve deprecation warnings (mhorky@redhat.com) +- Fixed one unused import of six (jhnidek@redhat.com) +- ENT-4272: Remove Python 2 conditionals (mhorky@redhat.com) +- ENT-4274: Remove six.assert* methods (mhorky@redhat.com) +- ENT-4275: Switch away from six.BytesIO and six.StringIO (mhorky@redhat.com) +- ENT-4082: Fix flake8 error E265 (mhorky@redhat.com) + +* Thu Sep 23 2021 Christopher Snyder 1.29.19-1 +- ENT-4083: Fix flake8 error E402 (mhorky@redhat.com) +- ENT-4085: Fix flake8 error E713 (mhorky@redhat.com) +- 2003777: Show available organizations before asking for input + (mhorky@redhat.com) +- ENT-4302: Remove "u" prefix from strings (mhorky@redhat.com) +- ENT-4326: Drop "-*- coding" comment (mhorky@redhat.com) +- ENT-4277: Drop __future__ imports (mhorky@redhat.com) +- 1979323: Cockpit - do not show red red icon in SCA mode (jhnidek@redhat.com) +- Remove outdated comments from the coverage Jenkins job (mhorky@redhat.com) +- ENT-4252: Migrate from nose to pytest (mhorky@redhat.com) +- Debian / Ubuntu multi-architectures support + (sbernhard@users.noreply.github.com) +- Translated using Weblate (Spanish) (ehespinosa57@gmail.com) +- 1859157: Display better error message on incorrect --org (mhorky@redhat.com) +- New D-Bus method GetOrg() (jhnidek@redhat.com) +- 1924338: list prints not status and dates in SCA mode (jhnidek@redhat.com) +- 1983144: More useful feedback on unknown argument (mhorky@redhat.com) +- ENT-4089: Fix flake8 error E741 (mhorky@redhat.com) +- ENT-4090: Fix flake8 error F821 (mhorky@redhat.com) +- Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ljanda@redhat.com) +- ENT-4091: Fix flake8 error F841 (mhorky@redhat.com) +- ENT-4228: Format rhsmlib exception (mhorky@redhat.com) +- ENT-4228: Always format restlib exceptions (mhorky@redhat.com) +- Update exception handling (mhorky@redhat.com) +- Drop unused M2Crypto bits (ptoscano@redhat.com) +- 1995465: Do not use deprecated collections.MutableMapping + (jhnidek@redhat.com) +- New extraction for translatable strings (ptoscano@redhat.com) +- 1983074: Remove invalid log level (mhorky@redhat.com) +- ENT-4213: Remove deprecated pep8 package (mhorky@redhat.com) +- build: switch to os.makedirs(..., exist_ok=True) (ptoscano@redhat.com) +- build: call create_dest_dir() only when running callback + (ptoscano@redhat.com) +- flake8: enable E131, E714 (ptoscano@redhat.com) +- 1859569: Abort on invalid username/token option in syspurpose commands + (mhorky@redhat.com) +- Drop logging.conf (ptoscano@redhat.com) +- Drop long-dead sat5to6 script (ptoscano@redhat.com) +- Drop RHN migration (ptoscano@redhat.com) +- 1922151: Add /var/cache/cloud-what to python3-cloud-what RPM. + (jhnidek@redhat.com) +- ENT-164: Remove ga_loader importer (mhorky@redhat.com) +- ENT-164: Drop rhsm-gtk (mhorky@redhat.com) +- ENT-164: Drop subscription-manager-gui & rhsm-icon (mhorky@redhat.com) +- Add minimal documentation for the plugins directories (ptoscano@redhat.com) +- ENT-4168: Unify description of --org in syspurpose subcommands + (mhorky@redhat.com) +- 1922151: Use in-memory cache on AWS too (jhnidek@redhat.com) +- Move zypper plugins to an own directory (ptoscano@redhat.com) +- Move dnf plugins to an own directory (ptoscano@redhat.com) +- Move libdnf plugins to an own directory (ptoscano@redhat.com) +- Drop support for YUM plugins (ptoscano@redhat.com) +- Drop YUM plugins (ptoscano@redhat.com) +- Add 'syspurpose' to list of commands in manpage (mhorky@redhat.com) +- ENT-4152: Drop initial-setup addon (mhorky@redhat.com) +- ENT-4136: Drop firstboot support (mhorky@redhat.com) +- ENT-3764: Change comments to follow Conscious language initiative + (mhorky@redhat.com) +- ENT-3764: Update variable names in hwprobe.py (mhorky@redhat.com) +- ENT-3764: Update project URLs to new versions (mhorky@redhat.com) +- ENT-3764: Remove BLACKLISTED_LOCALES (mhorky@redhat.com) +- 1980418: Add 'active' field to module stream profile (ianballou67@gmail.com) +- repos: document order of --enable & --disable (ptoscano@redhat.com) +- 1984133: repos: respect order of --enable & --disable (ptoscano@redhat.com) +- Include D-Bus sender in User-Agent http header; Singleton + (jhnidek@redhat.com) +- hwprobe.py: Fix counting cores per cpu for Fujitsu A64FX CPU + (m.mizuma@jp.fujitsu.com) +- flake8: enable E121, E122, E123, E126, E127, E128 (ptoscano@redhat.com) +- flake8: disable E122 for test/test_utils.py (ptoscano@redhat.com) +- Wrap first argument/element in function calls & containers + (ptoscano@redhat.com) +- Fix indentation of some continuation lines (ptoscano@redhat.com) +- 1974641: Fix tab completion with multiple optional commands + (mhorky@redhat.com) +- 1876828: Try to suppress errors in stderr when not run as root + (mhorky@redhat.com) +- 1977452: typo in string format change Add quotes to a {filename} and remove + an extra space. (tmerry@redhat.com) +- Update translation files (noreply@weblate.org) +- 1976240: Improve HTTP code/message reporting in error strings + (mhorky@redhat.com) +- Added new stage for running libdnf unit tests. (jhnidek@redhat.com) +- make sure gpg key download doesn't fail because of private certs + (sbernhard@users.noreply.github.com) * Thu Jul 15 2021 Christopher Snyder 1.29.18-1 - 1976324: Added cloud_what to log root namespaces (jhnidek@redhat.com)