diff --git a/sources b/sources index 8942147..58c3496 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.28.36.tar.gz) = 7c88215f8d88e0fb595d0e68795cb741285eec17d618fbaebb5e550fe7891d81f582927cd28924b716d10f0036b02fd6b919069e9262354a16fd5639aacb6e66 -SHA512 (subscription-manager-cockpit-1.28.36.tar.gz) = 096cf2c7f39723341ad3396d00984c0ff18792cd570d817344f36f3422ee4c1c062a6ceb9a7ae5748c20e0c77b50d18fe423bd030b1636b34fc54cf098c8dc89 +SHA512 (subscription-manager-1.28.37.tar.gz) = 8d2f24a912bef1506a51afd90d0c8f6ab076ae4b8c37100b6e2ccef96d9df8a934205ed706a5b3589dfbab306dfc598e931f2444df4d759cc37ae14ae630d896 +SHA512 (subscription-manager-cockpit-1.28.37.tar.gz) = cc30367110fca5b56b549641222bc21b6764bc96a996f9e3874c90349a691e5b0794ca98ac86607efdb355d1b4c01b3d725cc8a2864d9e4ecd4bcb8ee23c2424 diff --git a/subscription-manager.spec b/subscription-manager.spec index 4ea18ef..bb2bc16 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -15,9 +15,7 @@ %global use_container_plugin 1 %endif -%if (0%{?rhel} >= 7 || 0%{?fedora}) -%global dmidecode_version >= 3.12.2-2 -%endif +%global dmidecode_arches %{ix86} x86_64 aarch64 # We use the tmpfiles_create macro from systemd-rpm-macros rpm. # Because of an incorrect version labelling of that rpm in SLES 12 which @@ -244,8 +242,8 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.36 -Release: 2%{?dist} +Version: 1.28.37 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -291,6 +289,10 @@ Requires: %{py_package_prefix}-ethtool Requires: %{py_package_prefix}-iniparse Requires: %{py_package_prefix}-decorator Requires: virt-what +%ifarch %{dmidecode_arches} +Requires: dmidecode +%endif + %if 0%{?suse_version} Requires: logrotate Requires: cron @@ -337,11 +339,6 @@ 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 -Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} -%endif %endif %if %use_inotify @@ -366,7 +363,6 @@ BuildRequires: gcc BuildRequires: %{py_package_prefix}-setuptools BuildRequires: gettext BuildRequires: intltool -BuildRequires: libnotify-devel BuildRequires: %{py_package_prefix}-six %if %{use_subman_gui} || %{use_cockpit} @@ -384,10 +380,7 @@ 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 @@ -473,7 +466,6 @@ Group: System Environment/Base 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 @@ -746,8 +738,8 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi Summary: Python package for detection of public cloud provider License: GPLv2 Requires: python3-requests -%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x -Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} +%ifarch %{dmidecode_arches} +Requires: dmidecode %endif %description -n python3-cloud-what @@ -821,7 +813,6 @@ cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm %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 @@ -1003,9 +994,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{completion_dir}/rhn-migrate-classic-to-rhsm %endif -%if %use_subman_gui -%{completion_dir}/rhsm-icon -%endif %dir %{python_sitearch}/subscription_manager @@ -1161,7 +1149,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_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 @@ -1170,8 +1157,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_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 @@ -1181,7 +1167,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %doc %{_mandir}/man8/subscription-manager-gui.8* -%{_mandir}/man8/rhsm-icon.8* %doc LICENSE %endif @@ -1483,7 +1468,30 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Wed Feb 22 2023 Pino Toscano 1.28.36-2 +* Wed Apr 19 2023 Pino Toscano 1.28.37-1 +- 2174887: register: do a simple strip() on environment(s) input + (ptoscano@redhat.com) +- [1.28] Remove source code of rhsm-icon (jhnidek@redhat.com) +- Fix of unit tests of d-bus register: extended list of exceptions for + catching. (jhnidek@redhat.com) +- [1.28] Include D-Bus sender in User-Agent http header; Singleton + (jhnidek@redhat.com) +- Revert "Try to use --forked for all unit tests." (ptoscano@redhat.com) +- test: add simple test for 1982670 (ptoscano@redhat.com) +- 2076948: [1.28] Fix issue with race condition in rhsm.service + (jhnidek@redhat.com) +- 1982670: do not collect unentitled products in SCA mode (ptoscano@redhat.com) +- Use dmidecode on aarch64 (jhnidek@redhat.com) +- Fix possible parsing issues of dmidecode output (mhorky@redhat.com) +- zypper: drop dead python-dmidecode usage (ptoscano@redhat.com) +- facts: drop DmiFirmwareInfoCollector (ptoscano@redhat.com) +- facts: switch to DmidecodeFactCollector for DMI facts (ptoscano@redhat.com) +- facts: add dmidecode parser and facts collector (ptoscano@redhat.com) +- cloud-what: switch MiniHostCollector to dmidecode(1) (ptoscano@redhat.com) +- Remove pytest arguments for CentOS 9 Stream image (mhorky@redhat.com) +- tests: Install dnf-plugins-core every time (mhorky@redhat.com) + +* Wed Feb 22 2023 Pino Toscano 1.28.36-1 - Translated using Weblate (French) (ljanda@redhat.com) - Translated using Weblate (French) (suanand@redhat.com) - Translated using Weblate (Korean) (jsefler@redhat.com)