Update subscription-manager to 1.21.1-1
Resolves: #1448313 - Do not log error, when rhsmcertd is restarted (jhnidek@redhat.com) Resolves: #1304056 - Fix D-Bus path of com.redhat.RHSM1.Facts (jhnidek@redhat.com) Resolves: #1516439 - Cockpit reports error during unregister when candlepin unavailable Resolves: #1510727 - Enable starting of subman GUI, when consumer has been deleted Resolves: #1463765 - Fix wrong Indic-language translations (khowell@redhat.com) Resolves: #1487600 - Cockpit - Save configuration from register dialog Resolves: #1464571 - Improve multiple product certs errors (khowell@redhat.com) Resolves: #1507158 - Provide Host: in http CONNECT header (jhnidek@redhat.com) Resolves: #1319927 - Remove newline from auto enable message (khowell@redhat.com) Resolves: #1514067 - Call virt-what using absolute path (jhnidek@redhat.com) Resolves: #1487688 - Load config settings for cockpit plugin (khowell@redhat.com) Resolves: #1462456 - Flush stdout and stderr on more places (jhnidek@redhat.com) Resolves: #1491842 - fixed typo in man page. (jhnidek@redhat.com) Resolves: #1508591 - Removed python-rhsm from subscription-manager version Resolves: #1421010 - Subman-GUI shows error dialog (wrong proxy settings) Resolves: #1500106 - subscription-manager status --ondate do not ignore date Resolves: #1506970 - Fixed default custom URL in cockpit plugin (jhnidek@redhat.com) Resolves: #1508457 - Bump versions in python-rhsm obsoletes (khowell@redhat.com) Resolves: #1354667 - Add identity cert detection to proxy error message generation Resolves: #1501889 - Enable yum plugins after sub-man subcommand is executed Resolves: #1477958 - Use inotify for checking changes of consumer certs
This commit is contained in:
Alex Wood
parent
a3d64cee30
commit
29d27e1420
2
.gitignore
vendored
2
.gitignore
vendored
@ -73,3 +73,5 @@
|
|||||||
/subscription-manager-1.19.7.tar.gz
|
/subscription-manager-1.19.7.tar.gz
|
||||||
/subscription-manager-1.20.1.tar.gz
|
/subscription-manager-1.20.1.tar.gz
|
||||||
/subscription-manager-1.20.2.tar.gz
|
/subscription-manager-1.20.2.tar.gz
|
||||||
|
/subscription-manager-1.21.1.tar.gz
|
||||||
|
/subscription-manager-cockpit-1.21.1.tar.gz
|
||||||
|
|||||||
3
sources
3
sources
@ -1 +1,2 @@
|
|||||||
SHA512 (subscription-manager-1.20.2.tar.gz) = ecdd1f1e8fc9d26afeffae73b3c6d78b42ee33214160147732f994fcfc24d236a3153a37a25d621c7f6404a0e5fd23788f62fe8f217cd3c2f39cd860e6f9fc14
|
SHA512 (subscription-manager-1.21.1.tar.gz) = 74be74b29686c2ef47abdd1471d9835e072f3e5ca585c26a3ac3555395f87bd7c54ed8ae96b4f977f6402243931e0dd073c20806e0ed91d348185356dbdbd704
|
||||||
|
SHA512 (subscription-manager-cockpit-1.21.1.tar.gz) = 2157ec8f9e385407e9571ce7098ee9e1d1c2aceaa581e7e972958f86c5092be20aed871373708d10587a97dddfb255e04da7f58d93c9cab21e3af5b26eb2394c
|
||||||
|
|||||||
@ -6,7 +6,16 @@
|
|||||||
%global use_initial_setup 1
|
%global use_initial_setup 1
|
||||||
%global use_firstboot 0
|
%global use_firstboot 0
|
||||||
%global use_kitchen 1
|
%global use_kitchen 1
|
||||||
|
%global use_inotify 1
|
||||||
|
%global use_python3 0%{?fedora}
|
||||||
%global rhsm_plugins_dir /usr/share/rhsm-plugins
|
%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)
|
||||||
|
|
||||||
|
# SLES 11 and RHEL6 don't have macros defined for python2; just "python". Alias them.
|
||||||
|
%{!?__python2:%global __python2 %__python}
|
||||||
|
%{!?python2_sitearch:%global python2_sitearch %python_sitearch}
|
||||||
|
%{?python_provide:%python_provide python-rhsm}
|
||||||
|
|
||||||
%if %{use_systemd}
|
%if %{use_systemd}
|
||||||
# Note that %gtk3 will be undefined if it's not used
|
# Note that %gtk3 will be undefined if it's not used
|
||||||
@ -17,10 +26,12 @@
|
|||||||
%global use_initial_setup 0
|
%global use_initial_setup 0
|
||||||
%global use_firstboot 1
|
%global use_firstboot 1
|
||||||
%global use_kitchen 0
|
%global use_kitchen 0
|
||||||
|
%global use_inotify 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global use_dnf 0%{?fedora}
|
%global use_dnf 0%{?fedora}
|
||||||
%global use_yum (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?suse_version})
|
%global use_yum (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?suse_version})
|
||||||
|
%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
|
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
|
||||||
@ -71,7 +82,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: subscription-manager
|
Name: subscription-manager
|
||||||
Version: 1.20.2
|
Version: 1.21.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Tools and libraries for subscription and repository management
|
Summary: Tools and libraries for subscription and repository management
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -84,8 +95,11 @@ URL: http://www.candlepinproject.org/
|
|||||||
# yum install tito
|
# yum install tito
|
||||||
# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz
|
# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
# this is a little different from the Source0, because of limitations in tito,
|
||||||
|
# namely that tito expects only one source tarball
|
||||||
|
Source1: %{name}-cockpit-%{version}.tar.gz
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Source1: subscription-manager-rpmlintrc
|
Source2: subscription-manager-rpmlintrc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -103,7 +117,7 @@ Requires: python-ethtool
|
|||||||
Requires: python-iniparse
|
Requires: python-iniparse
|
||||||
Requires: python-decorator
|
Requires: python-decorator
|
||||||
Requires: virt-what
|
Requires: virt-what
|
||||||
Requires: python-rhsm >= 1.20.2
|
Requires: subscription-manager-rhsm = %{version}
|
||||||
Requires: python-decorator
|
Requires: python-decorator
|
||||||
Requires: python-six
|
Requires: python-six
|
||||||
Requires: python-dateutil
|
Requires: python-dateutil
|
||||||
@ -125,6 +139,10 @@ Requires: python-dmidecode
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %use_inotify
|
||||||
|
Requires: python-inotify
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %use_systemd
|
%if %use_systemd
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
@ -162,6 +180,11 @@ BuildRequires: systemd-rpm-macros
|
|||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# The %{?something:foo} expands to foo only when something is **defined**. Likewise the
|
||||||
|
# %{!?something:foo} expands only when something is **not defined**.
|
||||||
|
BuildRequires: %{?suse_version:python-devel >= 2.6} %{!?suse_version:python2-devel}
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
|
||||||
%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 Red Hat entitlement
|
||||||
@ -290,6 +313,79 @@ the remote in the currently deployed .origin file.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%package -n subscription-manager-rhsm
|
||||||
|
Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform
|
||||||
|
Group: Development/Libraries
|
||||||
|
|
||||||
|
%if %use_m2crypto
|
||||||
|
Requires: %{?suse_version:python-m2crypto} %{!?suse_version:m2crypto}
|
||||||
|
%endif
|
||||||
|
Requires: python-dateutil
|
||||||
|
Requires: python-iniparse
|
||||||
|
# rpm-python is an old name for python2-rpm but RHEL6 uses the old name
|
||||||
|
Requires: rpm-python
|
||||||
|
Requires: python-six
|
||||||
|
Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
|
||||||
|
Provides: python-rhsm = %{version}-%{release}
|
||||||
|
Obsoletes: python-rhsm <= 1.20.3-1
|
||||||
|
|
||||||
|
%description -n 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.
|
||||||
|
|
||||||
|
|
||||||
|
%if %{use_python3}
|
||||||
|
%package -n python3-subscription-manager-rhsm
|
||||||
|
Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
BuildRequires: python3-six
|
||||||
|
|
||||||
|
Requires: python3-dateutil
|
||||||
|
Requires: python3-iniparse
|
||||||
|
Requires: python3-rpm
|
||||||
|
Requires: python3-six
|
||||||
|
# M2Crypto isn't even used in new Fedoras and RHEL 8
|
||||||
|
Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
|
||||||
|
Provides: python3-python-rhsm = %{version}-%{release}
|
||||||
|
Obsoletes: python3-python-rhsm <= 1.20.3-1
|
||||||
|
|
||||||
|
# Required by Fedora packaging guidelines
|
||||||
|
%{?python_provide:%python_provide python3-python-rhsm}
|
||||||
|
|
||||||
|
%description -n python3-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
|
||||||
|
Group: Development/Libraries
|
||||||
|
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 Red Hat 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
|
||||||
|
License: LGPLv2.1+
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
Requires: subscription-manager
|
||||||
|
Requires: cockpit-bridge
|
||||||
|
Requires: cockpit-shell
|
||||||
|
|
||||||
|
%description -n subscription-manager-cockpit
|
||||||
|
Subscription Manager Cockpit UI
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
@ -299,8 +395,21 @@ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
%if %{use_python3}
|
||||||
make -f Makefile install VERSION=%{version}-%{release} \
|
make -f Makefile install VERSION=%{version}-%{release} \
|
||||||
PREFIX=%{buildroot} PYTHON_SITELIB=%{python_sitelib} \
|
PYTHON=/usr/bin/python3 PREFIX=%{_prefix} \
|
||||||
|
DESTDIR=%{buildroot} PYTHON_SITELIB=%{python3_sitearch} \
|
||||||
|
OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \
|
||||||
|
%{?install_ostree} %{?post_boot_tool} %{?gtk_version} \
|
||||||
|
%{?install_yum_plugins} %{?install_dnf_plugins} \
|
||||||
|
%{?install_zypper_plugins} \
|
||||||
|
%{?with_systemd}
|
||||||
|
rm %{buildroot}/usr/bin/subscription-manager
|
||||||
|
rm %{buildroot}/usr/bin/subscription-manager-gui
|
||||||
|
%endif
|
||||||
|
make -f Makefile install VERSION=%{version}-%{release} \
|
||||||
|
PYTHON=/usr/bin/python2 PREFIX=%{_prefix} \
|
||||||
|
DESTDIR=%{buildroot} PYTHON_SITELIB=%{python_sitearch} \
|
||||||
OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \
|
OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \
|
||||||
%{?install_ostree} %{?post_boot_tool} %{?gtk_version} \
|
%{?install_ostree} %{?post_boot_tool} %{?gtk_version} \
|
||||||
%{?install_yum_plugins} %{?install_dnf_plugins} \
|
%{?install_yum_plugins} %{?install_dnf_plugins} \
|
||||||
@ -337,6 +446,12 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority
|
|||||||
|
|
||||||
%{__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/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
||||||
|
|
||||||
|
%if %use_cockpit
|
||||||
|
# install cockpit dist targz
|
||||||
|
tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot}
|
||||||
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
@ -359,18 +474,22 @@ rm -rf %{buildroot}
|
|||||||
%dir %{_sysconfdir}/yum.repos.d
|
%dir %{_sysconfdir}/yum.repos.d
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%dir %{python_sitelib}/rhsmlib/candlepin
|
%dir %{python_sitearch}/rhsmlib/candlepin
|
||||||
%dir %{python_sitelib}/rhsmlib/compat
|
%dir %{python_sitearch}/rhsmlib/compat
|
||||||
%dir %{python_sitelib}/rhsmlib/dbus
|
%dir %{python_sitearch}/rhsmlib/dbus
|
||||||
%dir %{python_sitelib}/rhsmlib/dbus/facts
|
%dir %{python_sitearch}/rhsmlib/dbus/facts
|
||||||
%dir %{python_sitelib}/rhsmlib/dbus/objects
|
%dir %{python_sitearch}/rhsmlib/dbus/objects
|
||||||
%dir %{python_sitelib}/rhsmlib/facts
|
%dir %{python_sitearch}/rhsmlib/facts
|
||||||
%dir %{python_sitelib}/rhsmlib/services
|
%dir %{python_sitearch}/rhsmlib/services
|
||||||
%dir %{python_sitelib}/subscription_manager-%{version}-*.egg-info
|
%dir %{python_sitearch}/subscription_manager-%{version}-*.egg-info
|
||||||
%dir %{python_sitelib}/subscription_manager/api
|
%dir %{python_sitearch}/subscription_manager/api
|
||||||
%dir %{python_sitelib}/subscription_manager/branding
|
%dir %{python_sitearch}/subscription_manager/branding
|
||||||
%dir %{python_sitelib}/subscription_manager/model
|
%dir %{python_sitearch}/subscription_manager/model
|
||||||
%dir %{python_sitelib}/subscription_manager/plugin
|
%dir %{python_sitearch}/subscription_manager/plugin
|
||||||
|
%dir %{python_sitearch}/subscription_manager/scripts
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/rhsmlib
|
||||||
|
%endif
|
||||||
%dir %{_var}/spool/rhsm
|
%dir %{_var}/spool/rhsm
|
||||||
%dir %{_prefix}/share/polkit-1
|
%dir %{_prefix}/share/polkit-1
|
||||||
%dir %{_prefix}/share/polkit-1/actions
|
%dir %{_prefix}/share/polkit-1/actions
|
||||||
@ -440,25 +559,30 @@ rm -rf %{buildroot}
|
|||||||
%{_sysconfdir}/bash_completion.d/rhsm-icon
|
%{_sysconfdir}/bash_completion.d/rhsm-icon
|
||||||
%{_sysconfdir}/bash_completion.d/rhsmcertd
|
%{_sysconfdir}/bash_completion.d/rhsmcertd
|
||||||
|
|
||||||
%dir %{python_sitelib}/subscription_manager
|
%dir %{python_sitearch}/subscription_manager
|
||||||
|
|
||||||
# code, python modules and packages
|
# code, python modules and packages
|
||||||
%{python_sitelib}/subscription_manager-*.egg-info/*
|
%{python_sitearch}/subscription_manager-*.egg-info/*
|
||||||
%{python_sitelib}/subscription_manager/*.py*
|
%{python_sitearch}/subscription_manager/*.py*
|
||||||
%{python_sitelib}/subscription_manager/api/*.py*
|
%{python_sitearch}/subscription_manager/api/*.py*
|
||||||
%{python_sitelib}/subscription_manager/branding/*.py*
|
%{python_sitearch}/subscription_manager/branding/*.py*
|
||||||
%{python_sitelib}/subscription_manager/model/*.py*
|
%{python_sitearch}/subscription_manager/model/*.py*
|
||||||
%{python_sitelib}/subscription_manager/plugin/__init__.py*
|
%{python_sitearch}/subscription_manager/plugin/__init__.py*
|
||||||
|
%{python_sitearch}/subscription_manager/scripts/*.py*
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/subscription_manager-*.egg-info/*
|
||||||
|
%exclude %{python3_sitearch}/subscription_manager
|
||||||
|
%endif
|
||||||
|
|
||||||
# our gtk2/gtk3 compat modules
|
# our gtk2/gtk3 compat modules
|
||||||
%dir %{python_sitelib}/subscription_manager/ga_impls
|
%dir %{python_sitearch}/subscription_manager/ga_impls
|
||||||
%{python_sitelib}/subscription_manager/ga_impls/__init__.py*
|
%{python_sitearch}/subscription_manager/ga_impls/__init__.py*
|
||||||
|
|
||||||
%if 0%{?gtk3}
|
%if 0%{?gtk3}
|
||||||
%{python_sitelib}/subscription_manager/ga_impls/ga_gtk3.py*
|
%{python_sitearch}/subscription_manager/ga_impls/ga_gtk3.py*
|
||||||
%else
|
%else
|
||||||
%dir %{python_sitelib}/subscription_manager/ga_impls/ga_gtk2
|
%dir %{python_sitearch}/subscription_manager/ga_impls/ga_gtk2
|
||||||
%{python_sitelib}/subscription_manager/ga_impls/ga_gtk2/*.py*
|
%{python_sitearch}/subscription_manager/ga_impls/ga_gtk2/*.py*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# subscription-manager plugins
|
# subscription-manager plugins
|
||||||
@ -481,15 +605,18 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# rhsmlib
|
# rhsmlib
|
||||||
%dir %{python_sitelib}/rhsmlib
|
%dir %{python_sitearch}/rhsmlib
|
||||||
%{python_sitelib}/rhsmlib/*.py*
|
%{python_sitearch}/rhsmlib/*.py*
|
||||||
%{python_sitelib}/rhsmlib/candlepin/*.py*
|
%{python_sitearch}/rhsmlib/candlepin/*.py*
|
||||||
%{python_sitelib}/rhsmlib/compat/*.py*
|
%{python_sitearch}/rhsmlib/compat/*.py*
|
||||||
%{python_sitelib}/rhsmlib/facts/*.py*
|
%{python_sitearch}/rhsmlib/facts/*.py*
|
||||||
%{python_sitelib}/rhsmlib/services/*.py*
|
%{python_sitearch}/rhsmlib/services/*.py*
|
||||||
%{python_sitelib}/rhsmlib/dbus/*.py*
|
%{python_sitearch}/rhsmlib/dbus/*.py*
|
||||||
%{python_sitelib}/rhsmlib/dbus/facts/*.py*
|
%{python_sitearch}/rhsmlib/dbus/facts/*.py*
|
||||||
%{python_sitelib}/rhsmlib/dbus/objects/*.py*
|
%{python_sitearch}/rhsmlib/dbus/objects/*.py*
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/rhsmlib
|
||||||
|
%endif
|
||||||
|
|
||||||
%{_datadir}/polkit-1/actions/com.redhat.*.policy
|
%{_datadir}/polkit-1/actions/com.redhat.*.policy
|
||||||
%{_datadir}/dbus-1/system-services/com.redhat.*.service
|
%{_datadir}/dbus-1/system-services/com.redhat.*.service
|
||||||
@ -505,13 +632,19 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Incude rt CLI tool
|
# Incude rt CLI tool
|
||||||
%dir %{python_sitelib}/rct
|
%dir %{python_sitearch}/rct
|
||||||
%{python_sitelib}/rct/*.py*
|
%{python_sitearch}/rct/*.py*
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/rct
|
||||||
|
%endif
|
||||||
%attr(755,root,root) %{_bindir}/rct
|
%attr(755,root,root) %{_bindir}/rct
|
||||||
|
|
||||||
# Include consumer debug CLI tool
|
# Include consumer debug CLI tool
|
||||||
%dir %{python_sitelib}/rhsm_debug
|
%dir %{python_sitearch}/rhsm_debug
|
||||||
%{python_sitelib}/rhsm_debug/*.py*
|
%{python_sitearch}/rhsm_debug/*.py*
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/rhsm_debug
|
||||||
|
%endif
|
||||||
%attr(755,root,root) %{_bindir}/rhsm-debug
|
%attr(755,root,root) %{_bindir}/rhsm-debug
|
||||||
|
|
||||||
%doc
|
%doc
|
||||||
@ -527,10 +660,10 @@ rm -rf %{buildroot}
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%attr(755,root,root) %{_sbindir}/subscription-manager-gui
|
%attr(755,root,root) %{_sbindir}/subscription-manager-gui
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%dir %{python_sitelib}/subscription_manager/gui/data
|
%dir %{python_sitearch}/subscription_manager/gui/data
|
||||||
%dir %{python_sitelib}/subscription_manager/gui/data/glade
|
%dir %{python_sitearch}/subscription_manager/gui/data/glade
|
||||||
%dir %{python_sitelib}/subscription_manager/gui/data/icons
|
%dir %{python_sitearch}/subscription_manager/gui/data/icons
|
||||||
%dir %{python_sitelib}/subscription_manager/gui/data/ui
|
%dir %{python_sitearch}/subscription_manager/gui/data/ui
|
||||||
%dir %{_datadir}/appdata
|
%dir %{_datadir}/appdata
|
||||||
%dir %{_datadir}/gnome
|
%dir %{_datadir}/gnome
|
||||||
%dir %{_datadir}/gnome/help
|
%dir %{_datadir}/gnome/help
|
||||||
@ -541,11 +674,11 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
%{_bindir}/rhsm-icon
|
%{_bindir}/rhsm-icon
|
||||||
|
|
||||||
%dir %{python_sitelib}/subscription_manager/gui
|
%dir %{python_sitearch}/subscription_manager/gui
|
||||||
%{python_sitelib}/subscription_manager/gui/*.py*
|
%{python_sitearch}/subscription_manager/gui/*.py*
|
||||||
%{python_sitelib}/subscription_manager/gui/data/ui/*.ui
|
%{python_sitearch}/subscription_manager/gui/data/ui/*.ui
|
||||||
%{python_sitelib}/subscription_manager/gui/data/glade/*.glade
|
%{python_sitearch}/subscription_manager/gui/data/glade/*.glade
|
||||||
%{python_sitelib}/subscription_manager/gui/data/icons/*.svg
|
%{python_sitearch}/subscription_manager/gui/data/icons/*.svg
|
||||||
|
|
||||||
%{_datadir}/applications/subscription-manager-gui.desktop
|
%{_datadir}/applications/subscription-manager-gui.desktop
|
||||||
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
||||||
@ -574,8 +707,8 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files -n subscription-manager-migration
|
%files -n subscription-manager-migration
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%dir %{python_sitelib}/subscription_manager/migrate
|
%dir %{python_sitearch}/subscription_manager/migrate
|
||||||
%{python_sitelib}/subscription_manager/migrate/*.py*
|
%{python_sitearch}/subscription_manager/migrate/*.py*
|
||||||
%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm
|
%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm
|
||||||
|
|
||||||
%doc
|
%doc
|
||||||
@ -592,11 +725,12 @@ rm -rf %{buildroot}
|
|||||||
%dir %{_sysconfdir}/docker
|
%dir %{_sysconfdir}/docker
|
||||||
%dir %{_sysconfdir}/docker/certs.d
|
%dir %{_sysconfdir}/docker/certs.d
|
||||||
%dir %{_sysconfdir}/rhsm/ca
|
%dir %{_sysconfdir}/rhsm/ca
|
||||||
%dir %{python_sitelib}/subscription_manager/plugin
|
%dir %{python_sitearch}/subscription_manager/plugin
|
||||||
%endif
|
%endif
|
||||||
%{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf
|
%{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf
|
||||||
%{rhsm_plugins_dir}/container_content.py*
|
%{rhsm_plugins_dir}/container_content.py*
|
||||||
%{python_sitelib}/subscription_manager/plugin/container.py*
|
%{python_sitearch}/subscription_manager/plugin/container.py*
|
||||||
|
|
||||||
# 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}/rhsm/ca/redhat-entitlement-authority.pem
|
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
|
||||||
@ -608,7 +742,7 @@ rm -rf %{buildroot}
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf
|
%{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf
|
||||||
%{rhsm_plugins_dir}/ostree_content.py*
|
%{rhsm_plugins_dir}/ostree_content.py*
|
||||||
%{python_sitelib}/subscription_manager/plugin/ostree/*.py*
|
%{python_sitearch}/subscription_manager/plugin/ostree/*.py*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -640,10 +774,45 @@ rm -rf %{buildroot}
|
|||||||
%if %use_dnf
|
%if %use_dnf
|
||||||
%files -n dnf-plugin-subscription-manager
|
%files -n dnf-plugin-subscription-manager
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{python_sitelib}/dnf-plugins/*
|
%{python_sitearch}/dnf-plugins/*
|
||||||
|
%if %{use_python3}
|
||||||
|
%exclude %{python3_sitearch}/dnf-plugins/*
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%files -n subscription-manager-rhsm
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python2_sitearch}/rhsm
|
||||||
|
%{python2_sitearch}/rhsm/*
|
||||||
|
|
||||||
|
%if %{use_python3}
|
||||||
|
%files -n python3-subscription-manager-rhsm
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{python3_sitearch}/rhsm
|
||||||
|
%{python3_sitearch}/rhsm/*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files -n subscription-manager-rhsm-certificates
|
||||||
|
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
|
||||||
|
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca
|
||||||
|
|
||||||
|
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem
|
||||||
|
|
||||||
|
%if %use_cockpit
|
||||||
|
%files -n subscription-manager-cockpit
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%dir %{_datadir}/cockpit/subscription-manager
|
||||||
|
%{_datadir}/cockpit/subscription-manager/index.html
|
||||||
|
%{_datadir}/cockpit/subscription-manager/index.min.js.gz
|
||||||
|
%{_datadir}/cockpit/subscription-manager/subscriptions.css
|
||||||
|
%{_datadir}/cockpit/subscription-manager/manifest.json
|
||||||
|
%{_datadir}/cockpit/subscription-manager/po.*.js
|
||||||
|
%{_datadir}/cockpit/subscription-manager/po.js
|
||||||
|
%{_datadir}/cockpit/subscription-manager/node_modules/*
|
||||||
|
%{_datadir}/metainfo/org.cockpit-project.subscription-manager.metainfo.xml
|
||||||
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%if %use_systemd
|
%if %use_systemd
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -715,6 +884,72 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
|||||||
gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 11 2018 Alex Wood <awood@redhat.com> 1.21.1-1
|
||||||
|
- Do not enable gpgcheck if the only a metadata gpg key is configured
|
||||||
|
(git@PaulSD.com)
|
||||||
|
- 1448313: Do not log error, when rhsmcertd is restarted (jhnidek@redhat.com)
|
||||||
|
- Support configuration of a repo metadata signing key (git@PaulSD.com)
|
||||||
|
- Generate bin scripts via setuptools entry_points (khowell@redhat.com)
|
||||||
|
- 1304056: Fix D-Bus path of com.redhat.RHSM1.Facts (jhnidek@redhat.com)
|
||||||
|
- 1516439: Cockpit reports error during unregister when candlepin unavailable
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1510727: Enable starting of subman GUI, when consumer has been deleted
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
|
||||||
|
* Mon Dec 11 2017 Kevin Howell <khowell@redhat.com> 1.20.8-1
|
||||||
|
- Sync zanata translations (khowell@redhat.com)
|
||||||
|
- Add parameter to D-Bus API to pass locale for localization of errors
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1463765: Fix wrong Indic-language translations (khowell@redhat.com)
|
||||||
|
- 1487600: Cockpit - Save configuration from register dialog
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1464571: Improve multiple product certs errors (khowell@redhat.com)
|
||||||
|
- Replace cockpit-subscriptions (khowell@redhat.com)
|
||||||
|
- 1507158: Provide Host: in http CONNECT header (jhnidek@redhat.com)
|
||||||
|
- 1319927: Remove newline from auto enable message (khowell@redhat.com)
|
||||||
|
|
||||||
|
* Tue Nov 28 2017 Kevin Howell <khowell@redhat.com> 1.20.7-1
|
||||||
|
- Sync zanata translations (khowell@redhat.com)
|
||||||
|
|
||||||
|
* Tue Nov 28 2017 Kevin Howell <khowell@redhat.com> 1.20.6-1
|
||||||
|
- Sync zanata translations (khowell@redhat.com)
|
||||||
|
- 1514067: Call virt-what using absolute path (jhnidek@redhat.com)
|
||||||
|
- 1487688: Load config settings for cockpit plugin (khowell@redhat.com)
|
||||||
|
- Added dependencies to cockpit-bridge and cockpit-shell. (jhnidek@redhat.com)
|
||||||
|
- 1462456: Flush stdout and stderr on more places (jhnidek@redhat.com)
|
||||||
|
- 1491842: fixed typo in man page. (jhnidek@redhat.com)
|
||||||
|
- 1508591: Removed python-rhsm from subscription-manager version
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1421010: Subman-GUI shows error dialog (wrong proxy settings)
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1500106: subscription-manager status --ondate do not ignore date
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1506970: Fixed default custom URL in cockpit plugin (jhnidek@redhat.com)
|
||||||
|
|
||||||
|
* Thu Nov 02 2017 Kevin Howell <khowell@redhat.com> 1.20.5-1
|
||||||
|
- Sync zanata translations (khowell@redhat.com)
|
||||||
|
- Cockpit - listing of installed products using patternfly-react
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1508457: Bump versions in python-rhsm obsoletes (khowell@redhat.com)
|
||||||
|
- Implement fallback for settimeout on old m2crypto (khowell@redhat.com)
|
||||||
|
- Cockpit: reconcile translated strings (khowell@redhat.com)
|
||||||
|
- Cockpit: use translations from root dir (khowell@redhat.com)
|
||||||
|
|
||||||
|
* Mon Oct 30 2017 Kevin Howell <khowell@redhat.com> 1.20.4-1
|
||||||
|
- Fix cockpit tgz path in spec file (khowell@redhat.com)
|
||||||
|
|
||||||
|
* Mon Oct 30 2017 Kevin Howell <khowell@redhat.com> 1.20.3-1
|
||||||
|
- Cockpit: Implement modal dialog (khowell@redhat.com)
|
||||||
|
- Implement bootstrap-select component (khowell@redhat.com)
|
||||||
|
- Port cockpit subscriptions-client to dbus (khowell@redhat.com)
|
||||||
|
- Move python-rhsm build into subscription-manager (khowell@redhat.com)
|
||||||
|
- 1354667: Add identity cert detection to proxy error message generation
|
||||||
|
(wpoteat@redhat.com)
|
||||||
|
- 1501889: Enable yum plugins after sub-man subcommand is executed
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
- 1477958: Use inotify for checking changes of consumer certs
|
||||||
|
(jhnidek@redhat.com)
|
||||||
|
|
||||||
* Mon Oct 09 2017 Kevin Howell <khowell@redhat.com> 1.20.2-1
|
* Mon Oct 09 2017 Kevin Howell <khowell@redhat.com> 1.20.2-1
|
||||||
- Sync zanata translations (khowell@redhat.com)
|
- Sync zanata translations (khowell@redhat.com)
|
||||||
- Bump python-rhsm requirement to 1.20.2 (khowell@redhat.com)
|
- Bump python-rhsm requirement to 1.20.2 (khowell@redhat.com)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user