AlmaLinux changes
This commit is contained in:
commit
0dc63dedbb
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/subscription-manager-1.28.36.tar.gz
|
||||
SOURCES/subscription-manager-cockpit-1.28.36.tar.gz
|
||||
SOURCES/subscription-manager-1.28.44.tar.gz
|
||||
SOURCES/subscription-manager-cockpit-1.28.44.tar.gz
|
||||
|
@ -1,2 +1,2 @@
|
||||
6f4343d358f15c4a62d6c9e99bcd0cef4666a415 SOURCES/subscription-manager-1.28.36.tar.gz
|
||||
563cd7a7b586d72f5e9b4032593ba5befad64dff SOURCES/subscription-manager-cockpit-1.28.36.tar.gz
|
||||
14b2eace3714eaa4d6d95064c0f561734ec8652f SOURCES/subscription-manager-1.28.44.tar.gz
|
||||
264ebb8f882bbc887389695ce69e6b69ecc111e4 SOURCES/subscription-manager-cockpit-1.28.44.tar.gz
|
||||
|
@ -1,99 +0,0 @@
|
||||
diff --git a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
|
||||
index e21c57263..11adf1d79 100644
|
||||
--- a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
|
||||
+++ b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
|
||||
@@ -7,23 +7,9 @@
|
||||
<policy user="root">
|
||||
<allow own="com.redhat.RHSM1"/>
|
||||
|
||||
- <!-- Basic D-Bus API stuff -->
|
||||
- <allow send_destination="com.redhat.RHSM1"
|
||||
- send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
- <allow send_destination="com.redhat.RHSM1"
|
||||
- send_interface="org.freedesktop.DBus.Properties"/>
|
||||
- <allow send_destination="com.redhat.RHSM1"
|
||||
- send_interface="org.freedesktop.DBus.ObjectManager"/>
|
||||
-
|
||||
- <!-- allow Config.Set from root -->
|
||||
- <allow send_destination="com.redhat.RHSM1"
|
||||
- send_interface="com.redhat.RHSM1.Config"
|
||||
- send_member="Set"/>
|
||||
- </policy>
|
||||
-
|
||||
-
|
||||
- <policy context="default">
|
||||
- <!-- TODO: make these read-only by default -->
|
||||
+ <!--
|
||||
+ Lock down the objects to root access only
|
||||
+ -->
|
||||
|
||||
<allow send_destination="com.redhat.RHSM1"
|
||||
send_interface="com.redhat.RHSM1"/>
|
||||
@@ -37,11 +23,6 @@
|
||||
<allow send_destination="com.redhat.RHSM1"
|
||||
send_interface="com.redhat.RHSM1.Config"/>
|
||||
|
||||
- <!-- deny Config.Set by default -->
|
||||
- <deny send_destination="com.redhat.RHSM1"
|
||||
- send_interface="com.redhat.RHSM1.Config"
|
||||
- send_member="Set"/>
|
||||
-
|
||||
<allow send_destination="com.redhat.RHSM1"
|
||||
send_interface="com.redhat.RHSM1.RegisterServer"/>
|
||||
|
||||
@@ -65,5 +46,54 @@
|
||||
<allow send_destination="com.redhat.RHSM1"
|
||||
send_interface="org.freedesktop.DBus.ObjectManager"/>
|
||||
</policy>
|
||||
-</busconfig>
|
||||
|
||||
+
|
||||
+ <policy context="default">
|
||||
+
|
||||
+ <!--
|
||||
+ Non-root users can execute only methods providing
|
||||
+ information from files readable by non-root users.
|
||||
+ -->
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Entitlement"
|
||||
+ send_member="GetStatus"/>
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Products"
|
||||
+ send_member="ListInstalledProducts"/>
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Syspurpose"
|
||||
+ send_member="GetSyspurpose"/>
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Syspurpose"
|
||||
+ send_member="GetSyspurposeStatus"/>
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Config"
|
||||
+ send_member="GetAll"/>
|
||||
+
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Config"
|
||||
+ send_member="Get"/>
|
||||
+
|
||||
+ <!--
|
||||
+ The UUID returned by following method is read
|
||||
+ from consumer cert. Only this file is not
|
||||
+ readable by non-root users.
|
||||
+ -->
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="com.redhat.RHSM1.Consumer"
|
||||
+ send_member="GetUuid"/>
|
||||
+
|
||||
+ <!-- Basic D-Bus API stuff -->
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="org.freedesktop.DBus.Introspectable"/>
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="org.freedesktop.DBus.Properties"/>
|
||||
+ <allow send_destination="com.redhat.RHSM1"
|
||||
+ send_interface="org.freedesktop.DBus.ObjectManager"/>
|
||||
+ </policy>
|
||||
+</busconfig>
|
@ -1,14 +1,3 @@
|
||||
diff -aruN subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in
|
||||
--- subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
||||
+++ subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in 2022-05-10 19:54:31.000000000 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
[Desktop Entry]
|
||||
-_Name=Red Hat Subscription Validity Applet
|
||||
+_Name=Subscription Validity Applet
|
||||
Icon=subscription-manager
|
||||
Exec=rhsm-icon
|
||||
Terminal=false
|
||||
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
|
||||
--- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-13 18:01:03.000000000 +0300
|
||||
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in 2022-05-10 19:54:57.000000000 +0300
|
||||
@ -29,19 +18,6 @@ diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.deskto
|
||||
Icon=subscription-manager
|
||||
Exec=subscription-manager-gui
|
||||
Terminal=false
|
||||
diff -aruN subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py
|
||||
--- subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py 2022-04-13 18:01:03.000000000 +0300
|
||||
+++ subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py 2022-05-10 19:59:46.000000000 +0300
|
||||
@@ -278,8 +278,7 @@
|
||||
if self.options.five_to_six:
|
||||
msgs = [_("This system appears to already be registered to Satellite 6.")]
|
||||
else:
|
||||
- msgs = [_("This system appears to already be registered to Red Hat Subscription Management.")]
|
||||
- msgs.append(_("Please visit https://access.redhat.com/management/consumers/%s to view the profile details.") % identity.uuid)
|
||||
+ msgs = [_("This system appears to already be registered to Subscription Management.")]
|
||||
system_exit(1, msgs)
|
||||
|
||||
try:
|
||||
diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
|
||||
--- subscription-manager-1.28.29/src/subscription_manager/repolib.py 2022-04-13 18:01:03.000000000 +0300
|
||||
+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py 2022-05-10 20:01:44.000000000 +0300
|
||||
|
@ -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
|
||||
@ -51,13 +49,6 @@
|
||||
%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
|
||||
@ -188,12 +179,6 @@
|
||||
%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}
|
||||
%global with_cockpit WITH_COCKPIT=true
|
||||
%else
|
||||
@ -230,10 +215,6 @@
|
||||
%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}"
|
||||
@ -244,8 +225,8 @@
|
||||
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
|
||||
|
||||
Name: subscription-manager
|
||||
Version: 1.28.36
|
||||
Release: 3%{?dist}.alma.1
|
||||
Version: 1.28.44
|
||||
Release: 1%{?dist}.alma.1
|
||||
Summary: Tools and libraries for subscription and repository management
|
||||
%if 0%{?suse_version}
|
||||
Group: Productivity/Networking/System
|
||||
@ -271,13 +252,14 @@ Source1: %{name}-cockpit-%{version}.tar.gz
|
||||
Source2: subscription-manager-rpmlintrc
|
||||
%endif
|
||||
|
||||
%if (0%{?suse_version} && 0%{?suse_version} < 1200)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
%endif
|
||||
|
||||
# AlmaLinux Patch
|
||||
Patch100: use-almalinux-syspurposes.patch
|
||||
Patch101: subscription-manager-remove-redhat.repo.patch
|
||||
Patch102: subscription-manager-debrand.patch
|
||||
%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
|
||||
@ -295,6 +277,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
|
||||
@ -341,11 +327,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
|
||||
@ -370,7 +351,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}
|
||||
@ -388,10 +368,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
|
||||
@ -402,22 +379,20 @@ BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: systemd
|
||||
%endif
|
||||
|
||||
Obsoletes: subscription-manager-migration <= %{version}-%{release}
|
||||
|
||||
%if !%{use_container_plugin}
|
||||
Obsoletes: subscription-manager-plugin-container
|
||||
%endif
|
||||
|
||||
# AlmaLinux do not provide the following packages no more
|
||||
Obsoletes: subscription-manager-cockpit
|
||||
Obsoletes: subscription-manager-initial-setup-addon
|
||||
Obsoletes: rhsm-gtk
|
||||
Obsoletes: rhsm-icons
|
||||
|
||||
|
||||
Patch00001: 00001-fix-dbus-policy.patch
|
||||
|
||||
%description
|
||||
The Subscription Manager package provides programs and libraries to allow users
|
||||
to manage subscriptions and yum repositories from the EL entitlement
|
||||
to manage subscriptions and yum repositories from the entitlement
|
||||
platform.
|
||||
|
||||
|
||||
@ -486,7 +461,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
|
||||
@ -506,29 +480,6 @@ 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
|
||||
%package -n dnf-plugin-subscription-manager
|
||||
Summary: Subscription Manager plugins for DNF
|
||||
@ -632,7 +583,7 @@ the remote in the currently deployed .origin file.
|
||||
|
||||
|
||||
%package -n %{rhsm_package_name}
|
||||
Summary: A Python library to communicate with Unified Entitlement Platform
|
||||
Summary: A Python library to communicate with a Unified Entitlement Platform
|
||||
%if 0%{?suse_version}
|
||||
Group: Development/Libraries/Python
|
||||
%else
|
||||
@ -703,21 +654,6 @@ 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 Unified Entitlement Platform
|
||||
%if 0%{?suse_version}
|
||||
Group: Development/Libraries/Python
|
||||
%else
|
||||
Group: Development/Libraries
|
||||
%endif
|
||||
Provides: python-rhsm-certificates = %{version}-%{release}
|
||||
Obsoletes: python-rhsm-certificates <= 1.20.3-1
|
||||
|
||||
%description -n subscription-manager-rhsm-certificates
|
||||
This package contains certificates required for communicating with the REST interface
|
||||
of a Unified Entitlement Platform, used for the management of system entitlements
|
||||
and to receive access to content.
|
||||
|
||||
%if %use_cockpit
|
||||
%package -n subscription-manager-cockpit
|
||||
Summary: Subscription Manager Cockpit UI
|
||||
@ -761,8 +697,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
|
||||
@ -772,13 +708,17 @@ cloud metadata and signatures.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
|
||||
# Applying AlmaLinux Patch
|
||||
%patch -P 100 -p1 -b .use-almalinux-syspurposes
|
||||
%patch -P 101 -p1 -b .subscription-manager-remove-redhatrepo
|
||||
%patch -P 102 -p1 -b .subscription-manager-debrand
|
||||
|
||||
%build
|
||||
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
||||
LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \
|
||||
%{?gtk_version} \
|
||||
%{exclude_packages} %{?with_subman_gui} %{?with_subman_migration}
|
||||
%{exclude_packages} %{?with_subman_gui}
|
||||
|
||||
%if %{with python2_rhsm}
|
||||
python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
|
||||
@ -807,7 +747,6 @@ make -f Makefile install VERSION=%{version}-%{release} \
|
||||
%{?install_zypper_plugins} \
|
||||
%{?with_systemd} \
|
||||
%{?with_subman_gui} \
|
||||
%{?with_subman_migration} \
|
||||
%{?with_cockpit} \
|
||||
%{?exclude_packages}
|
||||
|
||||
@ -837,7 +776,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
|
||||
|
||||
@ -867,18 +805,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/
|
||||
%if %{undefined almalinux_ver}
|
||||
mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com
|
||||
install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
|
||||
install -m 644 %{_builddir}/%{buildsubdir}/src/content_plugins/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{undefined almalinux_ver}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca
|
||||
install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
|
||||
install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
||||
%else
|
||||
rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
|
||||
%endif
|
||||
|
||||
%if %use_cockpit
|
||||
# install cockpit dist targz
|
||||
tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot}
|
||||
@ -967,6 +897,7 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
%attr(755,root,root) %{_bindir}/rhsmcertd
|
||||
|
||||
%attr(755,root,root) %{_libexecdir}/rhsmcertd-worker
|
||||
%attr(755,root,root) %{_libexecdir}/rhsm-package-profile-uploader
|
||||
|
||||
|
||||
# our config dirs and files
|
||||
@ -1027,14 +958,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
%{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
|
||||
@ -1189,7 +1112,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
%{_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
|
||||
@ -1198,8 +1120,7 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
%{_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
|
||||
@ -1209,7 +1130,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
|
||||
%doc
|
||||
%{_mandir}/man8/subscription-manager-gui.8*
|
||||
%{_mandir}/man8/rhsm-icon.8*
|
||||
%doc LICENSE
|
||||
%endif
|
||||
|
||||
@ -1235,24 +1155,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
|
||||
%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
|
||||
|
||||
%files -n %{py_package_prefix}-syspurpose -f syspurpose.lang
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{python_sitelib}/syspurpose*.egg-info
|
||||
@ -1354,15 +1256,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
|
||||
%{python_sitearch}/cloud_what/providers/__pycache__
|
||||
%endif
|
||||
|
||||
%files -n subscription-manager-rhsm-certificates
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca
|
||||
|
||||
%if %{undefined almalinux_ver}
|
||||
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
|
||||
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
||||
%endif
|
||||
|
||||
%if %use_cockpit
|
||||
%files -n subscription-manager-cockpit
|
||||
%defattr(-,root,root,-)
|
||||
@ -1515,13 +1408,178 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 23 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1.28.36-3.alma.1
|
||||
- Debrand for AlmaLinux
|
||||
* Tue Jul 15 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1.28.44-1.alma.1
|
||||
- AlmaLinux changes
|
||||
|
||||
* Tue Aug 08 2023 Jiri Hnidek <jhnidek@redhat.com> 1.28.36-3
|
||||
- 2225442: Fix D-Bus policy (jhnidek@redhat.com)
|
||||
* Wed May 21 2025 Jiri Hnidek <jhnidek@redhat.com> 1.28.44-1
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- Translated using Weblate (Italian) (info@salvatorecocuzza.it)
|
||||
- Translated using Weblate (Italian) (noreply-mt-weblate-translation-
|
||||
memory@weblate.org)
|
||||
- Translated using Weblate (Italian) (info@salvatorecocuzza.it)
|
||||
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com)
|
||||
- Translated using Weblate (Spanish) (fserrador@gmail.com)
|
||||
|
||||
* Wed Feb 22 2023 Pino Toscano <ptoscano@redhat.com> 1.28.36-2
|
||||
* Thu Apr 10 2025 Jiri Hnidek <jhnidek@redhat.com> 1.28.43-1
|
||||
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com)
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (mhorky@redhat.com)
|
||||
- Translated using Weblate (French) (leane.grasser@proton.me)
|
||||
- Translated using Weblate (French) (noreply-mt-weblate-translation-
|
||||
memory@weblate.org)
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- Update translation files (noreply@weblate.org)
|
||||
- New extraction for translatable strings (ptoscano@redhat.com)
|
||||
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
|
||||
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
|
||||
- Translated using Weblate (Italian) (info@salvatorecocuzza.it)
|
||||
- Translated using Weblate (French) (leane.grasser@proton.me)
|
||||
- Translated using Weblate (German) (atalanttore@googlemail.com)
|
||||
- Translated using Weblate (Russian) (aleksejfedorov963@gmail.com)
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- tests: fix mocking of get_terminal_width() in TestColumnize
|
||||
(ptoscano@redhat.com)
|
||||
- feat: print compliance errors & syspurpose status only in entitlement mode
|
||||
(ptoscano@redhat.com)
|
||||
- feat: print "registered" as status when using SCA (ptoscano@redhat.com)
|
||||
- feat: print "not registered" on status when not registered
|
||||
(ptoscano@redhat.com)
|
||||
- tests: force syspurpose tests in test_status to non-SCA (ptoscano@redhat.com)
|
||||
- refactor: move determination of content access mode in own method
|
||||
(ptoscano@redhat.com)
|
||||
- tests: move StubIdentity to stubs (ptoscano@redhat.com)
|
||||
- tests: cleanup dead/broken bits in test_status (ptoscano@redhat.com)
|
||||
- chore: move banner printing to its own function (ptoscano@redhat.com)
|
||||
- ci: bump actions/upload-artifact from 3 to 4
|
||||
(49699333+dependabot[bot]@users.noreply.github.com)
|
||||
- ci: bump actions/checkout from 3 to 4
|
||||
(49699333+dependabot[bot]@users.noreply.github.com)
|
||||
- test: cockpit: switch to CERT auth for insights-client (ptoscano@redhat.com)
|
||||
- test: cockpit: mock-insights: implement upload and delete platform endpoints
|
||||
(ptoscano@redhat.com)
|
||||
- test: cockpit: mock-insights: fix/improve handling of IDs
|
||||
(ptoscano@redhat.com)
|
||||
- test: cockpit: mock-insights: refactor of two platform endpoints
|
||||
(ptoscano@redhat.com)
|
||||
- feat: cockpit: switch from .last-upload.results to .lastupload
|
||||
(ptoscano@redhat.com)
|
||||
- chore: cockpit: test: use the new syspurpose command (ptoscano@redhat.com)
|
||||
- test: cockpit: wait more when registering to Insights (ptoscano@redhat.com)
|
||||
- test: cockpit: break insights-client in a different way (ptoscano@redhat.com)
|
||||
- test: cockpit: mock-insights: return 404 for missing systems in /systems
|
||||
(ptoscano@redhat.com)
|
||||
- test: cockpit: wait longer in certain situations (ptoscano@redhat.com)
|
||||
- test: cockpit: assume /root/run-candlepin to start candlepin
|
||||
(ptoscano@redhat.com)
|
||||
- chore(ci): Use Vault for CentOS Stream 8 (mhorky@redhat.com)
|
||||
- fix: Hide subscription management "errors" in container mode
|
||||
(mhorky@redhat.com)
|
||||
- feat: 1.28 Added more AWS cloud facts (jhnidek@redhat.com)
|
||||
- feat: 1.28 Added zone GCP fact (jhnidek@redhat.com)
|
||||
- feat: 1.28 Azure: added extended location and type of location fact
|
||||
(jhnidek@redhat.com)
|
||||
- fix: 1.28 Update version of Azure metadata (jhnidek@redhat.com)
|
||||
- feat: 1.28 Added Azure location to facts (jhnidek@redhat.com)
|
||||
|
||||
* Thu Jan 25 2024 Pino Toscano <ptoscano@redhat.com> 1.28.42-1
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN))
|
||||
(mariocanfly@hotmail.com)
|
||||
- RHEL-21049: [1.28] RegisterServer is stopped, when not needed
|
||||
(jhnidek@redhat.com)
|
||||
- RHEL-21049: [1.28] Fix issue with registration using gsd-subman
|
||||
(jhnidek@redhat.com)
|
||||
|
||||
* Tue Dec 05 2023 Pino Toscano <ptoscano@redhat.com> 1.28.41-1
|
||||
- tito: drop bz requirement (ptoscano@redhat.com)
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (jsefler@redhat.com)
|
||||
- CCT-71: Try to ping server, when --proxy is used (jhnidek@redhat.com)
|
||||
- CCT-10: Ensure IPv6-based URLs are properly formatted (mhorky@redhat.com)
|
||||
- cli: normalize hostname in error message (ptoscano@redhat.com)
|
||||
- connection: normalize hostname in ConnectionOSErrorException
|
||||
(ptoscano@redhat.com)
|
||||
- Improved printing of addresses and URLs (jhnidek@redhat.com)
|
||||
- Use username and password from --proxy=URL (jhnidek@redhat.com)
|
||||
- Use parse_url() from utils.py for parsing URL, when --proxy is used.
|
||||
(jhnidek@redhat.com)
|
||||
- RHEL-13375: 1.28 Parse URL properly (jhnidek@redhat.com)
|
||||
- ci: stop testing on Fedora (ptoscano@redhat.com)
|
||||
- Simplify autoregistration test setup (mhorky@redhat.com)
|
||||
- RHEL-9435: Get AWS metadata via IMDSv2 (mhorky@redhat.com)
|
||||
|
||||
* Thu Sep 14 2023 Pino Toscano <ptoscano@redhat.com> 1.28.40-1
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com)
|
||||
|
||||
* Wed Aug 23 2023 Pino Toscano <ptoscano@redhat.com> 1.28.39-1
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- Update translation files (noreply@weblate.org)
|
||||
- 2225443: [1.28] Hotfix of D-Bus policy (jhnidek@redhat.com)
|
||||
- New extraction for translatable strings (ptoscano@redhat.com)
|
||||
- Translated using Weblate (Punjabi) (jsefler@redhat.com)
|
||||
- Translated using Weblate (Korean) (simmon@nplob.com)
|
||||
- [1.28] Update messaging around the "container mode" (#3310)
|
||||
(34436146+grunwmar@users.noreply.github.com)
|
||||
- ENT-5624: Properly translate error strings (mhorky@redhat.com)
|
||||
- ENT-5610: Explicitly check for provided entitlement certificates
|
||||
(mhorky@redhat.com)
|
||||
- Fix flake8 errors (mhorky@redhat.com)
|
||||
- Run flake8 and rpmlint on CI (mhorky@redhat.com)
|
||||
- Mock IOError for Insights fact collection tests (mhorky@redhat.com)
|
||||
- Collect GCP Project information as cloud facts (chambrid@redhat.com)
|
||||
- Collect Azure Subscription ID as a cloud fact (#3285) (chambrid@redhat.com)
|
||||
- Update cockpit test lib for Chromium 113 fix (martin@piware.de)
|
||||
- tests: repair attach cases in SCA mode (ptoscano@redhat.com)
|
||||
- 2091269: Make locking more reliable (jhnidek@redhat.com)
|
||||
|
||||
* Wed May 17 2023 Pino Toscano <ptoscano@redhat.com> 1.28.38-1
|
||||
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
|
||||
- Update translation files (noreply@weblate.org)
|
||||
- Clean up tests using Cloud What detectors properly (mhorky@redhat.com)
|
||||
- spec: Obsolete subscription-manager-migration (ptoscano@redhat.com)
|
||||
- New extraction for translatable strings (ptoscano@redhat.com)
|
||||
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
|
||||
- 2150814: Drop RHN migration (ptoscano@redhat.com)
|
||||
- ci: stop testing on Fedora Rawhide (ptoscano@redhat.com)
|
||||
- Drop redhat-uep.pem (ptoscano@redhat.com)
|
||||
- Move redhat-entitlement-authority.pem to container plugin
|
||||
(ptoscano@redhat.com)
|
||||
- Drop subscription-manager-rhsm-certificates package (ptoscano@redhat.com)
|
||||
- utils: import pkg_resources only when needed (ptoscano@redhat.com)
|
||||
- ENT-5532: Call rhsm-package-profile-uploader with --force-upload
|
||||
(jhnidek@redhat.com)
|
||||
- rhsmcertd reads default_log_level from rhsm.conf (jhnidek@redhat.com)
|
||||
- Create log dir by rhsmcertd, when log dir does not exist (jhnidek@redhat.com)
|
||||
- Fix issue with old glib not containing one macro (jhnidek@redhat.com)
|
||||
- 2132242: [1.28] Outsource uploading DNF profile to rhsmcertd
|
||||
(jhnidek@redhat.com)
|
||||
- 1890080: Handle IOErrors and Exceptions when looking for process names
|
||||
(csnyder@redhat.com)
|
||||
- ci: install nodejs-npm on Fedora (ptoscano@redhat.com)
|
||||
- tito: add centos-8-stream releaser (ptoscano@redhat.com)
|
||||
|
||||
* Wed Apr 19 2023 Pino Toscano <ptoscano@redhat.com> 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 <ptoscano@redhat.com> 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)
|
||||
@ -1549,6 +1607,7 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
- Fix tests for Python 3.6 runner (mhorky@redhat.com)
|
||||
- Stop calling pytest with --failed-first (mhorky@redhat.com)
|
||||
- Handle tests in containers better (mhorky@redhat.com)
|
||||
|
||||
* Fri Jan 20 2023 Pino Toscano <ptoscano@redhat.com> 1.28.35-1
|
||||
- Translated using Weblate (Spanish) (ptoscano@redhat.com)
|
||||
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
|
||||
|
Loading…
Reference in New Issue
Block a user