diff --git a/.gitignore b/.gitignore index 83b20e2..4d801ca 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,5 @@ /subscription-manager-cockpit-1.23.2.tar.gz /subscription-manager-1.23.3.tar.gz /subscription-manager-cockpit-1.23.3.tar.gz +/subscription-manager-1.23.4.tar.gz +/subscription-manager-cockpit-1.23.4.tar.gz diff --git a/sources b/sources index 92faf8e..dad23a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.23.3.tar.gz) = 82b985ac7aa3ccb83383634f35f345ae6e8b84451d8ba008a9d191d933fee4504de6a5517330ec47092c3994ac2883f8ee61e007a75fb23ebe4f0ca0025457d0 -SHA512 (subscription-manager-cockpit-1.23.3.tar.gz) = fe7cbdb33a1cef555421a03c0ee8d6060dfcd970f26b4933c6241b345ac9112a60cd7714652a076cd9ffb837609f038f44ba1ede19de68390066f2dff1a17194 +SHA512 (subscription-manager-1.23.4.tar.gz) = 245715086dd56a5044ade39775e1f8ebd15ebb24d9421d7a12bdb5c39d381557323810c31a49c0d0ecaf3aafa335c6dd4dcc4cae8f71c0c2fa2dfba94f296b8f +SHA512 (subscription-manager-cockpit-1.23.4.tar.gz) = 9f6947452496c2d79a45e99b9ff3b7da646383791d210f61fe8717e50da26b23bb7a99f5e88c448550325cb0e299143c87eac16c12abf42be2963d2c5d1db00f diff --git a/subscription-manager-rpmlintrc b/subscription-manager-rpmlintrc index 5e383cf..9714d45 100644 --- a/subscription-manager-rpmlintrc +++ b/subscription-manager-rpmlintrc @@ -1,12 +1,16 @@ -# this seems ok to me +# This seems ok to me addFilter('invalid-url') -# all yum plugins seem to hardcode paths + +# All yum and dnf plugins seem to hardcode paths addFilter("hardcoded-library-path .*lib/yum-plugins/.*") -# filter out zypper plugins too! +addFilter("hardcoded-library-path .*lib/dnf-plugins/.*") + +# Filter out zypper plugins too! addFilter("hardcoded-library-path .*lib/zypp/plugins/.*") -#sytemd tmpfiles are in /usr/lib + +# Systemd tmpfiles are in /usr/lib addFilter("hardcoded-library-path .*lib/tmpfiles.d/.*") -# ignore failing suse specific checks +# Ignore failing suse specific checks setBadness("suse-dbus-unauthorized-service", 0) setBadness("polkit-unauthorized-privilege", 0) diff --git a/subscription-manager.spec b/subscription-manager.spec index 0efad0f..78530c8 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -58,6 +58,7 @@ %if %{with python3} %global python_sitearch %python3_sitearch +%global python_sitelib %python3_sitelib %global __python %__python3 %global py_package_prefix python%{python3_pkgversion} %global rhsm_package_name %{py_package_prefix}-subscription-manager-rhsm @@ -130,7 +131,7 @@ %define subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.23.3 +Version: 1.23.4 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -541,12 +542,6 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c %find_lang rhsm -#%if %{use_subman_gui} -#%find_lang %{name} --with-gnome -#%endif - -# fix timestamps on our byte compiled files so they match across arches -find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; # fake out the redhat.repo file %if %{use_yum} || %{use_dnf} @@ -577,6 +572,9 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %py_byte_compile %{__python3} %{buildroot}%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ %endif +# fix timestamps on our byte compiled files so they match across arches +find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; + # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' %files -f rhsm.lang @@ -590,6 +588,12 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %dir %{_prefix}/lib/yum-plugins/ %endif +%if %{use_dnf} + %dir %{_sysconfdir}/dnf + %dir %{_sysconfdir}/dnf/plugins + %dir %{_prefix}/lib/dnf-plugins/ +%endif + %if %{use_yum} || %{use_dnf} %dir %{_sysconfdir}/yum.repos.d %endif @@ -656,6 +660,14 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/search-disabled-repos.conf %endif +# dnf plugin config +%if %{use_dnf} + # remove the repo file when we are deleted + %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnf/plugins/subscription-manager.conf + %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnf/plugins/product-id.conf + %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnf/plugins/search-disabled-repos.conf +%endif + # misc system config %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager %attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd @@ -905,6 +917,8 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %dir %{_sysconfdir}/rhsm/syspurpose %dir %{python3_sitelib}/syspurpose %{python3_sitelib}/syspurpose/{*.py*,__pycache__/*} +%doc %{_mandir}/man8/syspurpose.8.* +%doc LICENSE %attr(755, root, root) %{_sbindir}/syspurpose %attr(644,root,root) %{_sysconfdir}/rhsm/syspurpose/valid_fields.json @@ -960,7 +974,7 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %if %use_dnf %files -n dnf-plugin-subscription-manager %defattr(-,root,root,-) -%{python_sitearch}/dnf-plugins/* +%{python_sitelib}/dnf-plugins/* %endif @@ -1081,6 +1095,29 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Aug 30 2018 Christopher Snyder 1.23.4-1 +- 1600694: Log dbus exception tracebacks at the debug level + (csnyder@redhat.com) +- 1623368: Register a system without a syspurpose.json file + (jhnidek@redhat.com) +- Revert "Add sles version to dist" (cnsnyder@users.noreply.github.com) +- 1596699: Handle non-existant rhsm-debug destination (ENT-780) + (nmoumoul@redhat.com) +- Sync system purpose for sub-man subcommands (jhnidek@redhat.com) +- Add man page for syspurpose. (awood@redhat.com) +- 1613968: DNF product-id plugin can install product cert; ENT-789 + (jhnidek@redhat.com) +- Add sles version to dist (jsherril@redhat.com) +- Remove extraneous include in setup() (khowell@redhat.com) +- Updated translations (csnyder@redhat.com) +- 1596001: Change syspurpose import error log level to debug level + (csnyder@redhat.com) +- 1602702: rhsmcertd did not close lock file; ENT-736 (jhnidek@redhat.com) +- Adds the addons set of commands to syspurpose (csnyder@redhat.com) +- 1581445: ENT-564: rhsm configuration manage_repos is not working on RHEL8 + (jhnidek@redhat.com) +- Fix time stamps of pyc files (csnyder@redhat.com) + * Mon Aug 13 2018 Christopher Snyder 1.23.3-1 - 1606435: Rename the async module for compatibility with python 3.7; ENT-737 (csnyder@redhat.com)