AlmaLinux changes
This commit is contained in:
parent
9149f79ecf
commit
41ed02d2d7
73
SOURCES/subscription-manager-debrand.patch
Normal file
73
SOURCES/subscription-manager-debrand.patch
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
diff -Naur subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in
|
||||||
|
--- subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in 2021-02-18 05:55:39.035895432 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in 2021-03-24 00:43:26.233292918 +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 -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in
|
||||||
|
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in 2021-02-18 05:55:39.035895432 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in 2021-03-24 00:43:45.609663355 +0300
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
-_Name=Red Hat Subscription Manager
|
||||||
|
+_Name=Subscription Manager
|
||||||
|
Icon=subscription-manager
|
||||||
|
Type=Application
|
||||||
|
Exec=/usr/libexec/cockpit-desktop /cockpit/@localhost/subscriptions/index.html
|
||||||
|
diff -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in
|
||||||
|
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in 2021-02-18 05:55:39.035895432 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in 2021-03-24 00:43:16.151860329 +0300
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
-_Name=Red Hat Subscription Manager
|
||||||
|
+_Name=Subscription Manager
|
||||||
|
Icon=subscription-manager
|
||||||
|
Exec=subscription-manager-gui
|
||||||
|
Terminal=false
|
||||||
|
diff -Naur subscription-manager-1.27.18.orig/src/dnf-plugins/subscription-manager.py subscription-manager-1.27.18.debrand/src/dnf-plugins/subscription-manager.py
|
||||||
|
--- subscription-manager-1.27.18.orig/src/dnf-plugins/subscription-manager.py 2021-02-18 05:55:38.960062621 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/src/dnf-plugins/subscription-manager.py 2021-03-24 00:45:55.599044136 +0300
|
||||||
|
@@ -47,11 +47,11 @@
|
||||||
|
)
|
||||||
|
|
||||||
|
not_registered_warning = _("""
|
||||||
|
-This system is not registered to Red Hat Subscription Management. You can use subscription-manager to register.
|
||||||
|
+This system is not registered to Subscription Management. You can use subscription-manager to register.
|
||||||
|
""")
|
||||||
|
|
||||||
|
no_subs_warning = _("""
|
||||||
|
-This system is registered to Red Hat Subscription Management, but is not receiving updates. You can use \
|
||||||
|
+This system is registered to Subscription Management, but is not receiving updates. You can use \
|
||||||
|
subscription-manager to assign subscriptions.
|
||||||
|
""")
|
||||||
|
|
||||||
|
diff -Naur subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py
|
||||||
|
--- subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py 2021-02-18 05:55:38.971979206 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py 2021-03-24 00:45:36.979918648 +0300
|
||||||
|
@@ -279,8 +279,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 -Naur subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py
|
||||||
|
--- subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py 2021-02-18 05:55:38.973062531 +0300
|
||||||
|
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py 2021-03-24 00:44:17.617615991 +0300
|
||||||
|
@@ -87,7 +87,7 @@
|
||||||
|
@staticmethod
|
||||||
|
def warning_message(enabled_yum_plugins):
|
||||||
|
message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
|
||||||
|
- 'Red Hat Subscription Management. If not desired, use '
|
||||||
|
+ 'Subscription Management. If not desired, use '
|
||||||
|
'"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
|
||||||
|
'block this behavior.') % ', '.join(enabled_yum_plugins)
|
||||||
|
return message
|
16
SOURCES/subscription-manager-remove-redhat.repo.patch
Normal file
16
SOURCES/subscription-manager-remove-redhat.repo.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py
|
||||||
|
--- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py 2020-07-28 11:06:10.000000000 -0500
|
||||||
|
+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py 2020-08-05 16:48:00.911709258 -0500
|
||||||
|
@@ -368,11 +368,7 @@ class RepoFileBase(object):
|
||||||
|
Try to create new repo file.
|
||||||
|
:return: None
|
||||||
|
"""
|
||||||
|
- self.create_dir_path()
|
||||||
|
- if self.path_exists(self.path) or not self.manage_repos:
|
||||||
|
- return
|
||||||
|
- with open(self.path, 'w') as f:
|
||||||
|
- f.write(self.REPOFILE_HEADER)
|
||||||
|
+ pass
|
||||||
|
|
||||||
|
def fix_content(self, content):
|
||||||
|
return content
|
20
SOURCES/use-almalinux-syspurposes.patch
Normal file
20
SOURCES/use-almalinux-syspurposes.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
|
||||||
|
index 1ac7ea0e..305ec4b9 100644
|
||||||
|
--- a/etc-conf/syspurpose/valid_fields.json
|
||||||
|
+++ b/etc-conf/syspurpose/valid_fields.json
|
||||||
|
@@ -1,12 +1,10 @@
|
||||||
|
{
|
||||||
|
"role": [
|
||||||
|
- "Red Hat Enterprise Linux Server",
|
||||||
|
- "Red Hat Enterprise Linux Workstation",
|
||||||
|
- "Red Hat Enterprise Linux Compute Node"
|
||||||
|
+ "AlmaLinux Server",
|
||||||
|
+ "AlmaLinux Workstation",
|
||||||
|
+ "AlmaLinux Compute Node"
|
||||||
|
],
|
||||||
|
"service_level_agreement": [
|
||||||
|
- "Premium",
|
||||||
|
- "Standard",
|
||||||
|
"Self-Support"
|
||||||
|
],
|
||||||
|
"usage": [
|
@ -1,9 +1,10 @@
|
|||||||
|
%global dist %{?dist}.alma
|
||||||
# Prefer systemd over sysv on Fedora and RHEL 7+
|
# 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)
|
%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
|
# For optional building of ostree-plugin sub package. Unrelated to systemd
|
||||||
# but the same versions apply at the moment.
|
# but the same versions apply at the moment.
|
||||||
%global has_ostree %use_systemd && 0%{?suse_version} == 0
|
%global has_ostree %use_systemd && 0%{?suse_version} == 0
|
||||||
%global use_initial_setup 1
|
%global use_initial_setup 0
|
||||||
%global use_firstboot 0
|
%global use_firstboot 0
|
||||||
%global use_inotify 1
|
%global use_inotify 1
|
||||||
%global py2_package_prefix python2
|
%global py2_package_prefix python2
|
||||||
@ -94,14 +95,14 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot})
|
%if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot})
|
||||||
%global use_rhsm_gtk 1
|
%global use_rhsm_gtk 0
|
||||||
%else
|
%else
|
||||||
%global use_rhsm_gtk 0
|
%global use_rhsm_gtk 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7)
|
%global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7)
|
||||||
%global use_yum (0%{?rhel} && 0%{?rhel} <= 7)
|
%global use_yum (0%{?rhel} && 0%{?rhel} <= 7)
|
||||||
%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7
|
%global use_cockpit 0
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
%global python_sitearch %python3_sitearch
|
%global python_sitearch %python3_sitearch
|
||||||
@ -274,6 +275,10 @@ Source2: subscription-manager-rpmlintrc
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Patch100: use-almalinux-syspurposes.patch
|
||||||
|
Patch101: subscription-manager-remove-redhat.repo.patch
|
||||||
|
Patch102: subscription-manager-debrand.patch
|
||||||
|
|
||||||
# The following macro examples are preceeded by '%' to stop macro expansion
|
# 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
|
# in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for
|
||||||
# why this is necessary)
|
# why this is necessary)
|
||||||
@ -401,9 +406,15 @@ BuildRequires: systemd
|
|||||||
Obsoletes: subscription-manager-plugin-container
|
Obsoletes: subscription-manager-plugin-container
|
||||||
%endif
|
%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
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Subscription Manager package provides programs and libraries to allow users
|
The Subscription Manager package provides programs and libraries to allow users
|
||||||
to manage subscriptions and yum repositories from the Red Hat entitlement
|
to manage subscriptions and yum repositories from the EL entitlement
|
||||||
platform.
|
platform.
|
||||||
|
|
||||||
|
|
||||||
@ -463,7 +474,7 @@ and RHSM initial_setup module for Anaconda.
|
|||||||
|
|
||||||
%if %{use_subman_gui}
|
%if %{use_subman_gui}
|
||||||
%package -n subscription-manager-gui
|
%package -n subscription-manager-gui
|
||||||
Summary: A GUI interface to manage Red Hat product subscriptions
|
Summary: A GUI interface to manage product subscriptions
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Group: Productivity/Networking/System
|
Group: Productivity/Networking/System
|
||||||
%else
|
%else
|
||||||
@ -487,7 +498,7 @@ Requires(postun): scrollkeeper
|
|||||||
|
|
||||||
%description -n subscription-manager-gui
|
%description -n subscription-manager-gui
|
||||||
This package contains a GTK+ graphical interface for configuring and
|
This package contains a GTK+ graphical interface for configuring and
|
||||||
registering a system with a Red Hat Entitlement platform and manage
|
registering a system with a Entitlement platform and manage
|
||||||
subscriptions.
|
subscriptions.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -550,7 +561,7 @@ Requires: dnf >= 1.0.0
|
|||||||
|
|
||||||
%description -n dnf-plugin-subscription-manager
|
%description -n dnf-plugin-subscription-manager
|
||||||
This package provides plugins to interact with repositories and subscriptions
|
This package provides plugins to interact with repositories and subscriptions
|
||||||
from the Red Hat entitlement platform; contains subscription-manager and
|
from the entitlement platform; contains subscription-manager and
|
||||||
product-id plugins.
|
product-id plugins.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -585,9 +596,11 @@ Group: System Environment/Base
|
|||||||
Requires: rhsm-gtk = %{version}-%{release}
|
Requires: rhsm-gtk = %{version}-%{release}
|
||||||
Requires: initial-setup-gui >= 0.3.9.24-1
|
Requires: initial-setup-gui >= 0.3.9.24-1
|
||||||
Obsoletes: subscription-manager-firstboot < 1.15.3-1
|
Obsoletes: subscription-manager-firstboot < 1.15.3-1
|
||||||
|
%if %{undefined almalinux_ver}
|
||||||
%if (0%{?rhel} >= 8)
|
%if (0%{?rhel} >= 8)
|
||||||
Supplements: initial-setup-gui
|
Supplements: initial-setup-gui
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n subscription-manager-initial-setup-addon
|
%description -n subscription-manager-initial-setup-addon
|
||||||
This package contains the initial-setup screens for subscription-manager.
|
This package contains the initial-setup screens for subscription-manager.
|
||||||
@ -616,7 +629,7 @@ the remote in the currently deployed .origin file.
|
|||||||
|
|
||||||
|
|
||||||
%package -n %{rhsm_package_name}
|
%package -n %{rhsm_package_name}
|
||||||
Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform
|
Summary: A Python library to communicate with Unified Entitlement Platform
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Group: Development/Libraries/Python
|
Group: Development/Libraries/Python
|
||||||
%else
|
%else
|
||||||
@ -650,14 +663,14 @@ Obsoletes: python-rhsm <= 1.20.3-1
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description -n %{rhsm_package_name}
|
%description -n %{rhsm_package_name}
|
||||||
A small library for communicating with the REST interface of a Red Hat Unified
|
A small library for communicating with the REST interface of a Unified
|
||||||
Entitlement Platform. This interface is used for the management of system
|
Entitlement Platform. This interface is used for the management of system
|
||||||
entitlements, certificates, and access to content.
|
entitlements, certificates, and access to content.
|
||||||
|
|
||||||
|
|
||||||
%if %{with python2_rhsm}
|
%if %{with python2_rhsm}
|
||||||
%package -n python2-subscription-manager-rhsm
|
%package -n python2-subscription-manager-rhsm
|
||||||
Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform
|
Summary: A Python library to communicate with a Unified Entitlement Platform
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Group: Development/Libraries/Python
|
Group: Development/Libraries/Python
|
||||||
%else
|
%else
|
||||||
@ -681,13 +694,13 @@ Provides: python-rhsm = %{version}-%{release}
|
|||||||
Obsoletes: python-rhsm <= 1.20.3-1
|
Obsoletes: python-rhsm <= 1.20.3-1
|
||||||
|
|
||||||
%description -n python2-subscription-manager-rhsm
|
%description -n python2-subscription-manager-rhsm
|
||||||
A small library for communicating with the REST interface of a Red Hat Unified
|
A small library for communicating with the REST interface of a Unified
|
||||||
Entitlement Platform. This interface is used for the management of system
|
Entitlement Platform. This interface is used for the management of system
|
||||||
entitlements, certificates, and access to content.
|
entitlements, certificates, and access to content.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%package -n subscription-manager-rhsm-certificates
|
%package -n subscription-manager-rhsm-certificates
|
||||||
Summary: Certificates required to communicate with a Red Hat Unified Entitlement Platform
|
Summary: Certificates required to communicate with a Unified Entitlement Platform
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Group: Development/Libraries/Python
|
Group: Development/Libraries/Python
|
||||||
%else
|
%else
|
||||||
@ -698,7 +711,7 @@ Obsoletes: python-rhsm-certificates <= 1.20.3-1
|
|||||||
|
|
||||||
%description -n subscription-manager-rhsm-certificates
|
%description -n subscription-manager-rhsm-certificates
|
||||||
This package contains certificates required for communicating with the REST interface
|
This package contains certificates required for communicating with the REST interface
|
||||||
of a Red Hat Unified Entitlement Platform, used for the management of system entitlements
|
of a Unified Entitlement Platform, used for the management of system entitlements
|
||||||
and to receive access to content.
|
and to receive access to content.
|
||||||
|
|
||||||
%if %use_cockpit
|
%if %use_cockpit
|
||||||
@ -719,7 +732,7 @@ Subscription Manager Cockpit UI
|
|||||||
|
|
||||||
%if %{use_rhsm_icons}
|
%if %{use_rhsm_icons}
|
||||||
%package -n rhsm-icons
|
%package -n rhsm-icons
|
||||||
Summary: Icons for Red Hat Subscription Management client tools
|
Summary: Icons for Subscription Management client tools
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -734,12 +747,15 @@ Conflicts: subscription-manager-cockpit < 1.26.7
|
|||||||
|
|
||||||
%description -n rhsm-icons
|
%description -n rhsm-icons
|
||||||
This package contains the desktop icons for the graphical interfaces provided for management
|
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,
|
of subscriptions. There are many such interfaces, subscription-manager-gui,
|
||||||
subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily.
|
subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch100 -p1
|
||||||
|
%patch101 -p1
|
||||||
|
%patch102 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
||||||
@ -824,8 +840,10 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c
|
|||||||
# fake out the redhat.repo file
|
# fake out the redhat.repo file
|
||||||
%if %{use_yum} || %{use_dnf}
|
%if %{use_yum} || %{use_dnf}
|
||||||
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
|
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
|
||||||
|
%if %{undefined almalinux_ver}
|
||||||
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
|
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
# fake out the certificate directories
|
# fake out the certificate directories
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer
|
mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer
|
||||||
@ -834,13 +852,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement
|
|||||||
%if %{use_container_plugin}
|
%if %{use_container_plugin}
|
||||||
# Setup cert directories for the container plugin:
|
# Setup cert directories for the container plugin:
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/
|
mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/
|
||||||
|
%if %{undefined almalinux_ver}
|
||||||
mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com
|
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}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{undefined almalinux_ver}
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca
|
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-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
|
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
|
%if %use_cockpit
|
||||||
# install cockpit dist targz
|
# install cockpit dist targz
|
||||||
@ -866,6 +890,10 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{defined almalinux_ver}
|
||||||
|
sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
# base/cli tools use the gettext domain 'rhsm', while the
|
# base/cli tools use the gettext domain 'rhsm', while the
|
||||||
# gnome-help tools use domain 'subscription-manager'
|
# gnome-help tools use domain 'subscription-manager'
|
||||||
%files -f rhsm.lang
|
%files -f rhsm.lang
|
||||||
@ -1245,10 +1273,12 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
|||||||
%endif
|
%endif
|
||||||
%{python_sitearch}/subscription_manager/plugin/container/*.py*
|
%{python_sitearch}/subscription_manager/plugin/container/*.py*
|
||||||
|
|
||||||
|
%if %{undefined almalinux_ver}
|
||||||
# Copying Red Hat CA cert into each directory:
|
# Copying Red Hat CA cert into each directory:
|
||||||
%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
|
%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
|
||||||
%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
|
%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %has_ostree
|
%if %has_ostree
|
||||||
%files -n subscription-manager-plugin-ostree
|
%files -n subscription-manager-plugin-ostree
|
||||||
@ -1303,8 +1333,10 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
|||||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
|
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
|
||||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca
|
%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-entitlement-authority.pem
|
||||||
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %use_cockpit
|
%if %use_cockpit
|
||||||
%files -n subscription-manager-cockpit
|
%files -n subscription-manager-cockpit
|
||||||
@ -1453,6 +1485,9 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 30 2021 Andrew Lukoshko <alukoshko@almalinux.org> 1.28.13-3.alma
|
||||||
|
- Debrand for AlmaLinux
|
||||||
|
|
||||||
* Tue Jun 08 2021 Christopher Snyder <csnyder@redhat.com> 1.28.13-3
|
* Tue Jun 08 2021 Christopher Snyder <csnyder@redhat.com> 1.28.13-3
|
||||||
- 1951053: Fix issue with dnf/yum variables (jhnidek@redhat.com)
|
- 1951053: Fix issue with dnf/yum variables (jhnidek@redhat.com)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user