diff --git a/.gitignore b/.gitignore index 762817b..55bef34 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /subscription-manager-1.11.6.tar.gz /subscription-manager-1.11.7.tar.gz /subscription-manager-1.12.3.tar.gz +/subscription-manager-1.12.11.tar.gz diff --git a/sources b/sources index 9dd1929..a4c90b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f01d485ffad4a91ad5cc7788136b7803 subscription-manager-1.12.3.tar.gz +695b750bcc8b5fa6926813d32361c2cb subscription-manager-1.12.11.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 20f4708..262ed1a 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -1,5 +1,8 @@ # Prefer systemd over sysv on Fedora 17+ and RHEL 7+ %global use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7) +# For optional building of ostree-plugin sub package. Unrelated to systemd +# but the same versions apply at the moment. +%global has_ostree %use_systemd %global use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6) %global rhsm_plugins_dir /usr/share/rhsm-plugins @@ -11,8 +14,14 @@ %global el5 1 %endif +%if %{has_ostree} +%define install_ostree INSTALL_OSTREE_PLUGIN=true +%else +%define install_ostree INSTALL_OSTREE_PLUGIN=false +%endif + Name: subscription-manager -Version: 1.12.3 +Version: 1.12.11 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -73,11 +82,14 @@ to manage subscriptions and yum repositories from the Red Hat entitlement platform. +%if %has_ostree %package -n subscription-manager-plugin-ostree Summary: A plugin for handling OSTree content. Group: System Environment/Base Requires: pygobject3-base +# plugin needs a slightly newer version of python-iniparse for 'tidy' +Requires: python-iniparse >= 0.4 %description -n subscription-manager-plugin-ostree Enables handling of content of type 'ostree' in any certificates @@ -89,7 +101,7 @@ the remote in the currently deployed .origin file. %{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf %{rhsm_plugins_dir}/ostree_content.py* %{_datadir}/rhsm/subscription_manager/plugin/ostree/*.py* - +%endif %package -n subscription-manager-gui Summary: A GUI interface to manage Red Hat product subscriptions @@ -156,7 +168,8 @@ make -f Makefile CFLAGS="%{optflags}" %install rm -rf %{buildroot} -make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} +make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} %{?install_ostree} + desktop-file-validate \ %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop @@ -433,6 +446,90 @@ fi %endif %changelog +* Wed Jul 30 2014 Alex Wood 1.12.11-1 +- 1124726: Man page entry for '--no-subscriptions' option (wpoteat@redhat.com) +- 1122772: yum repolist now displays warning when appropriate. + (csnyder@redhat.com) + +* Fri Jul 25 2014 jesus m. rodriguez 1.12.10-1 +- Revert "1114132: subman-gui and other tools are disabled in container mode." (jesusr@redhat.com) +- Revert "include dirent.h" (jesusr@redhat.com) + +* Fri Jul 25 2014 jesus m. rodriguez 1.12.9-1 +- include dirent.h (jesusr@redhat.com) + +* Fri Jul 25 2014 jesus m. rodriguez 1.12.8-1 +- 1039577: simplify reposgui gpgcheck control (ckozak@redhat.com) +- 1046132: Makes rhsm-icon slightly less annoying. (csnyder@redhat.com) +- 1054632: Adds '7.x' to how to launch section of manual. (csnyder@redhat.com) +- 1065158: Prompt for environment on registration when necessary (ckozak@redhat.com) +- 1114126: Container mode message is written to stderr (csnyder@redhat.com) +- 1114132: subman-gui and other tools are disabled in container mode. (csnyder@redhat.com) +- 1115499: Allow enable/disable repos in same command. (dgoodwin@redhat.com) +- 1118012: Fixes several typos in man page. (csnyder@redhat.com) +- 1121251: rhsm-debug system does not bash-complete for "--no-subscriptions" (wpoteat@redhat.com) +- 1121272: fix typo that blocked enabling repos via CLI (ckozak@redhat.com) +- cleanup and fix gui pool reselection on refresh (ckozak@redhat.com) +- Force subscription-manager yum plugin to respect the managed root (rholy@redhat.com) +- Force product-id yum plugin to respect the managed root (rholy@redhat.com) +- Display other overrides in the gui (ckozak@redhat.com) + +* Thu Jul 03 2014 jesus m. rodriguez 1.12.7-1 +- 1114117: Allow subscriptions to be excluded from rhsm-debug data collection (wpoteat@redhat.com) +- Remove debugging print line from managerlib (ckozak@redhat.com) + +* Mon Jun 30 2014 jesus m. rodriguez 1.12.6-1 +- 1022622: Modifies --no-overlap to show pools which provide products not already covered. (csnyder@redhat.com) +- Reload ostree_config after updating remotes. (alikins@redhat.com) +- Fix iniparse tidy import. (alikins@redhat.com) +- Remove noise debug logging. (alikins@redhat.com) +- Include 'tls-ca-path' for ostree remote configs. (alikins@redhat.com) +- Use iniparse.util.tidy if installed. (alikins@redhat.com) +- Fix odd ostree repo config whitespace issues. (alikins@redhat.com) +- Always update ostree refspec when adding remotes. (alikins@redhat.com) + +* Thu Jun 26 2014 Adrian Likins 1.12.5-1 +- Merge pull request #978 from candlepin/alikins/ostree_gpg_http + (alikins@redhat.com) +- Merge pull request #979 from candlepin/csnyder/help_message_identity_force + (jmrodri@nc.rr.com) +- Use rhsm.baseurl for ostree urls as well. (alikins@redhat.com) +- Handle Content.gpg="http://" as gpg-verify=false (alikins@redhat.com) +- 1107810: Updates help message for identity --force. (csnyder@redhat.com) +- Merge pull request #977 from candlepin/alikins/handle_no_origin (dgoodwin@rm- + rf.ca) +- Merge pull request #974 from cgwalters/doc-typos (jmrodri@nc.rr.com) +- Merge pull request #973 from candlepin/alikins/1112282_cond_ostree_rpm + (jmrodri@nc.rr.com) +- make has_ostree use macro value NOT hardcoded value. (jesusr@redhat.com) +- Handle missing or empty ostree origin file. (alikins@redhat.com) +- Fix saving ostree remote configs with gpg set. (alikins@redhat.com) +- plugin/ostree: Fix doc typos (walters@verbum.org) +- Merge pull request #972 from candlepin/ckozak/fix_custom_fact_log + (jmrodri@nc.rr.com) +- Merge pull request #968 from candlepin/alikins/setup_py (jmrodri@nc.rr.com) +- 1112282: Dont build ostree plugin subpackage < 7 (alikins@redhat.com) +- Merge pull request #966 from + candlepin/alikins/1108257_rhel_5_workstation_special (c4kofony@gmail.com) +- Add required bz flags to tito releaser definition. (dgoodwin@redhat.com) +- 1112326: remove extra '/' from custom fact loading error logging + (ckozak@redhat.com) +- Allow tests to run in any TZ (mstead@redhat.com) +- Temp ignore use of subprocess.check_output (alikins@redhat.com) +- Add test cases for 'rhel-5-workstation' tags. (alikins@redhat.com) +- 1108257: special case prod tag rhel-5-workstation (alikins@redhat.com) +- Add a simple setup.py. (alikins@redhat.com) +- Merge pull request #965 from candlepin/alikins/good_enthusiasm_pep8 (dgoodwin + @rm-rf.ca) +- Turn off verbose mode of pyqver. (alikins@redhat.com) +- make stylish cleanups for new pep8 (alikins@redhat.com) +- Add tox.ini with ignores for pep8 indention (alikins@redhat.com) + +* Thu Jun 19 2014 Devan Goodwin 1.12.4-1 +- Fix broken logging statement in container mode. (dgoodwin@redhat.com) +- 1067035: Move Subscription Manager version for better layout + (wpoteat@redhat.com) + * Mon Jun 16 2014 Alex Wood 1.12.3-1 - Bumping required python-rhsm version (mstead@redhat.com) - Fixing checkstyle. (mstead@redhat.com)