diff --git a/.gitignore b/.gitignore index fa36f09..1b39ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /subscription-manager-1.13.9.tar.gz /subscription-manager-1.13.12.tar.gz /subscription-manager-1.13.13.tar.gz +/subscription-manager-1.14.1.tar.gz diff --git a/sources b/sources index 90e67c0..aad7737 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -469b6ceb694bd658cf9e7ff54875a730 subscription-manager-1.13.13.tar.gz +417677921c98fc60f82125564c9745f8 subscription-manager-1.14.1.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 38ac330..c54591b 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -21,7 +21,7 @@ %endif Name: subscription-manager -Version: 1.13.13 +Version: 1.14.1 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -116,6 +116,10 @@ from the server. Populates /etc/docker/certs.d appropriately. %{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf %{rhsm_plugins_dir}/container_content.py* %{_datadir}/rhsm/subscription_manager/plugin/container.py* +# Copying Red Hat CA cert into each directory: +%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}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %package -n subscription-manager-gui Summary: A GUI interface to manage Red Hat product subscriptions @@ -202,6 +206,16 @@ touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer 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 + +# The normal redhat-uep.pem is actually a bundle of three CAs. Docker does not handle bundles well +# and only reads the first CA in the bundle. We need to put the right CA a file by itself. +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 + %post -n subscription-manager-gui touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : @@ -273,6 +287,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/dmiinfo.py* %{_datadir}/rhsm/subscription_manager/entcertlib.py* %{_datadir}/rhsm/subscription_manager/entbranding.py* +%{_datadir}/rhsm/subscription_manager/cp_provider.py* %{_datadir}/rhsm/subscription_manager/factlib.py* %{_datadir}/rhsm/subscription_manager/facts.py* %{_datadir}/rhsm/subscription_manager/healinglib.py* @@ -297,6 +312,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/packageprofilelib.py* %{_datadir}/rhsm/subscription_manager/plugins.py* %{_datadir}/rhsm/subscription_manager/productid.py* +%{_datadir}/rhsm/subscription_manager/reasons.py* %{_datadir}/rhsm/subscription_manager/release.py* %{_datadir}/rhsm/subscription_manager/repolib.py* %{_datadir}/rhsm/subscription_manager/rhelentbranding.py* @@ -311,6 +327,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/exceptions.py* %{_datadir}/rhsm/subscription_manager/plugin/*.py* +%{_datadir}/rhsm/subscription_manager/version.py* # subscription-manager plugins %dir %{rhsm_plugins_dir} %dir %{_sysconfdir}/rhsm/pluginconf.d @@ -348,6 +365,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/rct/cli.py* %{_datadir}/rhsm/rct/*commands.py* %{_datadir}/rhsm/rct/printing.py* +%{_datadir}/rhsm/rct/version.py* %attr(755,root,root) %{_bindir}/rct # Include consumer debug CLI tool @@ -466,6 +484,15 @@ fi %endif %changelog +* Fri Feb 06 2015 Devan Goodwin 1.14.1-1 +- 976855: populate a "version.py" at build time (alikins@redhat.com) +- Fixed typo in subscription-manager-gui (crog@redhat.com) +- 1186386: Provide one and only one Red Hat CA to Docker. (awood@redhat.com) +- 1114117: Stop collecting subs info by default. (alikins@redhat.com) +- 1184940: Update container plugin config. (dgoodwin@redhat.com) +- 1183122: Fix KeyErrors building dbus ent status (alikins@redhat.com) +- 884285: Needs to maintain loop for dbus calls (wpoteat@redhat.com) + * Wed Jan 14 2015 William Poteat 1.13.13-1 - 1175284: Show warning for crossdev --noarchive (wpoteat@redhat.com) - Add missing import of GMT() (alikins@redhat.com)