diff --git a/.gitignore b/.gitignore index 4d801ca..89d1d16 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ /subscription-manager-cockpit-1.23.3.tar.gz /subscription-manager-1.23.4.tar.gz /subscription-manager-cockpit-1.23.4.tar.gz +/subscription-manager-1.24.1.tar.gz +/subscription-manager-cockpit-1.24.1.tar.gz diff --git a/sources b/sources index f30de47..deb0566 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.23.4.tar.gz) = 245715086dd56a5044ade39775e1f8ebd15ebb24d9421d7a12bdb5c39d381557323810c31a49c0d0ecaf3aafa335c6dd4dcc4cae8f71c0c2fa2dfba94f296b8f -SHA512 (subscription-manager-cockpit-1.23.4.tar.gz) = 2a6ce45c6192d5f058a7c8de72418368a7dfb8dc074fae4da9673d027675125ef43ca494e6ea27a2b1de9d1790d6dae639da50ed1946379ff8a824083d3a8473 +SHA512 (subscription-manager-1.24.1.tar.gz) = 9ee946d20de62a85a235306e50d7430e32d16e4408b9a8c1a525ae1661b47482e9094b593f2ee13bf7a743bf863c532f2f2fd66f08bf4a8e47ef59afab1e7277 +SHA512 (subscription-manager-cockpit-1.24.1.tar.gz) = acb425d2b1532907200b4419f6f8016e7a51f5c16f8562ad8e9c50ade3d839218778fd381b949977700c0a8c331924f9b03600e8393ab9ab4845b2c76c0970f6 diff --git a/subscription-manager.spec b/subscription-manager.spec index 78530c8..94edc72 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -96,14 +96,14 @@ %define install_zypper_plugins INSTALL_ZYPPER_PLUGINS=false %endif -# makefile defaults to INSTALL_DNF_PLUGIN=false +# makefile defaults to INSTALL_DNF_PLUGINS=false %if %{use_dnf} %define install_dnf_plugins INSTALL_DNF_PLUGINS=true %else %define install_dnf_plugins INSTALL_DNF_PLUGINS=false %endif -# makefile defaults to INSTALL_DNF_PLUGIN=true +# makefile defaults to INSTALL_YUM_PLUGINS=true %if %{use_yum} %define install_yum_plugins INSTALL_YUM_PLUGINS=true %else @@ -131,7 +131,7 @@ %define subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.23.4 +Version: 1.24.1 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -178,6 +178,7 @@ Requires: %{py_package_prefix}-setuptools %if %{with python3} Requires: python3-dbus +Requires: python3-syspurpose %else Requires: %{?suse_version:dbus-1-python} %{!?suse_version:dbus-python} %endif @@ -202,7 +203,7 @@ 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 ppc ppc64 s390 s390x +%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} %endif %endif @@ -349,12 +350,17 @@ subscriptions %package -n dnf-plugin-subscription-manager Summary: Subscription Manager plugins for DNF Group: System Environment/Base +# See BZ 1581410 - avoid a circular dependency +%if (0%{?rhel} < 8) Requires: %{name} = %{version}-%{release} +%endif Requires: dnf >= 1.0.0 %if %{with python3} Requires: python3-dnf-plugins-core +Requires: python3-librepo %else Requires: python2-dnf-plugins-core +Requires: python2-librepo %endif %description -n dnf-plugin-subscription-manager @@ -498,7 +504,8 @@ Subscription Manager Cockpit UI %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ - LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" %{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} + LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ + %{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} %if %{with python2_rhsm} python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release} @@ -567,14 +574,14 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot} %endif +# fix timestamps on our byte compiled files so they match across arches +find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; + %if %{with python3} %py_byte_compile %{__python3} %{buildroot}%{rhsm_plugins_dir}/ %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 @@ -739,7 +746,7 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; # zypper plugins %if 0%{?suse_version} -%{_prefix}/lib/zypp/plugins/services/subscription-manager +%{_prefix}/lib/zypp/plugins/services/rhsm %{_prefix}/lib/zypp/plugins/commit/product-id %endif @@ -1095,6 +1102,50 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Oct 15 2018 Christopher Snyder 1.24.1-1 +- Rename zypper plugin to rhsm (khowell@redhat.com) +- 1632384: Sync SLA regardless of capability: (nmoumoul@redhat.com) +- 1621783: Updated syspurpose fields to match expected values (crog@redhat.com) +- 1633575: Update error message when syspurpose is not supported by server + (csnyder@redhat.com) +- 1614925: Fix grammar (csnyder@redhat.com) +- Added support of modulemd to combined profile; ENT-834 (jhnidek@redhat.com) +- 1620136: dnf plugin deletes prod cert as expected; ENT-773 + (jhnidek@redhat.com) +- 1615944: Show help when no args are provided (csnyder@redhat.com) +- 1614943: Fix bytes/unicode handling of dmi data (khowell@redhat.com) +- 1618825: Rename de_DE.po and es_ES.po (awood@redhat.com) +- Combined profile: WIP enabled repos (jhnidek@redhat.com) +- Added list of enabled repos to combined profile; ENT-833 (jhnidek@redhat.com) +- 1607955: WIP: polishing PR with bug fix of release --list + (jhnidek@redhat.com) +- Fixed name of capability and added two unit tests. (jhnidek@redhat.com) +- Explict requires added for package we use directly (wpoteat@redhat.com) +- 1581410: Eliminate potential for circular dependency (awood@redhat.com) +- 1631076: subscription-manager rpm now requires python3-syspurpose + (nmoumoul@redhat.com) +- For tito build, clean the yarn cache (khowell@redhat.com) +- Fix ubuntu compat for virt-who travis runs (khowell@redhat.com) +- Fix RPMDiff issue with multilib (jhnidek@redhat.com) +- Use Combined Profile reporting (jhnidek@redhat.com) +- 1629073: No python3-dmidecode on aarch64, ppc64le (khowell@redhat.com) +- Simplify and fix subpackages logic (khowell@redhat.com) +- 1614653: Update intermediate CA (khowell@redhat.com) +- Fix spelling to capitalize Workstation properly (bcourt@redhat.com) +- 1607955: Try to use all entitlement certs for connection with CDN + (jhnidek@redhat.com) +- Use pre-provisioned centos7 box (khowell@redhat.com) +- Vagrant: use ansible-role-subman-devel via galaxy (khowell@redhat.com) +- Vagrant: skip provisioning if var needs_provision is false + (khowell@redhat.com) + +* Mon Sep 10 2018 Christopher Snyder 1.24.0-1 +- Use the "service_level_agreement" attribute for the SlaCommand + (csnyder@redhat.com) +- 1623262: Make automatic enablement of yum plugins working again; ENT-820 + (jhnidek@redhat.com) +- Start releasing to f29 (csnyder@redhat.com) + * Thu Aug 30 2018 Christopher Snyder 1.23.4-1 - 1600694: Log dbus exception tracebacks at the debug level (csnyder@redhat.com)