diff --git a/sources b/sources index 58c3496..bf4f5e3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.28.37.tar.gz) = 8d2f24a912bef1506a51afd90d0c8f6ab076ae4b8c37100b6e2ccef96d9df8a934205ed706a5b3589dfbab306dfc598e931f2444df4d759cc37ae14ae630d896 -SHA512 (subscription-manager-cockpit-1.28.37.tar.gz) = cc30367110fca5b56b549641222bc21b6764bc96a996f9e3874c90349a691e5b0794ca98ac86607efdb355d1b4c01b3d725cc8a2864d9e4ecd4bcb8ee23c2424 +SHA512 (subscription-manager-1.28.38.tar.gz) = dee1baf5c31cb3c3f256a3e8d6f57b22e6f53d0dd79d921f4e9d5e258ad4dd572cd9eb2b93c1855b76a8deca0490445596795aa947680877f7c27dd07484d044 +SHA512 (subscription-manager-cockpit-1.28.38.tar.gz) = f433356d27ec7ab466cb4367b1d365c879cd05043f8aa0129d341f9fc3f23f2dcb3346eeed98568dbb478f18aaff4b545a6b830abfaeadd74dad3280b256f7d2 diff --git a/subscription-manager.spec b/subscription-manager.spec index bb2bc16..951626e 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -49,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 @@ -186,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 @@ -228,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}" @@ -242,7 +225,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.37 +Version: 1.28.38 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -391,6 +374,8 @@ BuildRequires: systemd-rpm-macros BuildRequires: systemd %endif +Obsoletes: subscription-manager-migration <= %{version}-%{release} + %if !%{use_container_plugin} Obsoletes: subscription-manager-plugin-container %endif @@ -485,29 +470,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 @@ -680,21 +642,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 Red Hat 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 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 @@ -754,7 +701,7 @@ cloud metadata and signatures. 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} @@ -783,7 +730,6 @@ make -f Makefile install VERSION=%{version}-%{release} \ %{?install_zypper_plugins} \ %{?with_systemd} \ %{?with_subman_gui} \ - %{?with_subman_migration} \ %{?with_cockpit} \ %{?exclude_packages} @@ -839,13 +785,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ 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 -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 - %if %use_cockpit # install cockpit dist targz tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot} @@ -930,6 +872,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %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 @@ -990,11 +933,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{completion_dir}/rhsm-debug %{completion_dir}/rhsmcertd -%if %{use_subscription_manager_migration} -%{completion_dir}/rhn-migrate-classic-to-rhsm -%endif - - %dir %{python_sitearch}/subscription_manager # code, python modules and packages @@ -1192,24 +1130,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %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 @@ -1309,13 +1229,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{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 - -%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem - %if %use_cockpit %files -n subscription-manager-cockpit %defattr(-,root,root,-) @@ -1468,6 +1381,32 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed May 17 2023 Pino Toscano 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 1.28.37-1 - 2174887: register: do a simple strip() on environment(s) input (ptoscano@redhat.com)