rpms/subscription-manager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update subscription-manager to 1.11.1-1

Browse Source 
Resolves: #1021069 - Add reference to network usage info. (alikins@redhat.com)
Resolves: #1061923 - Remove trailing period from privacy URL (wpoteat@redhat.com)
Resolves: #1039913 - rhsm-debug updates and fixes (alikins@redhat.com)
Resolves: #1061407 - don't allow some translations (ckozak@redhat.com)
Resolves: #1055664 - rhsm-debug now follows more config paths (alikins@redhat.com)
Resolves: #1038242 - add anaconda.pid check before chroot (alikins@redhat.com)
Resolves: #1035115 - Update product id certs (alikins@redhat.com)
Resolves: #864195 - New output line for subscribe --auto if it can't cover all products
Resolves: #1060727 - Changes to rhsm-debug for sos report (wpoteat@redhat.com)
Resolves: #1044596 - Don't match beta product tags for release (alikins@redhat.com)
Resolves: #851325 - Tweak activation key checkbox to left (alikins@redhat.com)
Resolves: #958016 - use rpm %%{optflags} and _hardended_build (alikins@redhat.com)
Resolves: #1061937 - preference changes occur in the background (ckozak@redhat.com)
Resolves: #1061393 - Don't allow subscription-manager string to be translated
Resolves: #1016427 - On string was missed from the extraction (bkearney@redhat.com)
Resolves: #1058495 - productid yum errors on yum remove (alikins@redhat.com)
Resolves: #1026501 - Preserve PKI directories and have rpm own them.
Resolves: #1058374 - Fix crash on exception in managergui._show_buttons
Resolves: #1034574 - Alternate message based on why no repos exist in GUI
Resolves: #1034649 - Only allow repolib to update override cache if supported by the
This commit is contained in:
Alex Wood 2014-02-27 16:37:07 -05:00
parent e1df1cff29
commit 2bd6bc6955
3 changed files with 70 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@
/subscription-manager-1.10.8.tar.gz
/subscription-manager-1.10.10.tar.gz
/subscription-manager-1.10.13.tar.gz
/subscription-manager-1.11.1.tar.gz

2
sources
View File

@ -1 +1 @@
a401e7fadb19db6f6911626e31b89a7a subscription-manager-1.10.13.tar.gz
35eda79f0792c845c71bf61a16078087 subscription-manager-1.11.1.tar.gz

90
subscription-manager.spec
View File

@ -1,18 +1,19 @@
# Prefer systemd over sysv on Fedora 17+ and RHEL 7+
%define use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7)
%define use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6)
%define use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6)
%global use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7)
%global use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6)
%global use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6)
%global rhsm_plugins_dir /usr/share/rhsm-plugins
%define rhsm_plugins_dir /usr/share/rhsm-plugins
%global _hardened_build 1
# A couple files are for RHEL 5 only:
%if 0%{?rhel} == 5
%define el5 1
%global el5 1
%endif
Name: subscription-manager
Version: 1.10.13
Version: 1.11.1
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
@ -46,20 +47,19 @@ Requires: python-dateutil
Requires: PyXML
%endif
# There's no dmi to read on these arches, so don't pull in this dep.
%ifnarch ppc ppc64 s390 s390x
Requires: python-dmidecode
%endif
%if %use_systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%else
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
%if %use_systemd
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%endif
BuildRequires: python-devel
@ -71,6 +71,10 @@ BuildRequires: desktop-file-utils
BuildRequires: redhat-lsb
BuildRequires: scrollkeeper
BuildRequires: GConf2-devel
%if %use_systemd
# We need the systemd RPM macros
BuildRequires: systemd
%endif
%description
@ -140,7 +144,7 @@ subscriptions
%setup -q
%build
make -f Makefile
make -f Makefile CFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
@ -160,6 +164,10 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \;
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
# fake out the certificate directories
mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer
mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement
%post -n subscription-manager-gui
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
@ -184,6 +192,8 @@ rm -rf %{buildroot}
%attr(755,root,root) %dir %{_var}/spool/rhsm/debug
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/facts
%attr(755,root,root) %dir %{_sysconfdir}/pki/consumer
%attr(755,root,root) %dir %{_sysconfdir}/pki/entitlement
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.SubscriptionManager.conf
@ -240,6 +250,7 @@ rm -rf %{buildroot}
%{_datadir}/rhsm/subscription_manager/release.py*
%{_datadir}/rhsm/subscription_manager/repolib.py*
%{_datadir}/rhsm/subscription_manager/rhelentbranding.py*
%{_datadir}/rhsm/subscription_manager/rhelproduct.py*
%{_datadir}/rhsm/subscription_manager/utils.py*
%{_datadir}/rhsm/subscription_manager/printing_utils.py*
%{_datadir}/rhsm/subscription_manager/validity.py*
@ -276,7 +287,7 @@ rm -rf %{buildroot}
%if %use_systemd
%attr(644,root,root) %{_unitdir}/rhsmcertd.service
%attr(644,root,root) %{_prefix}/lib/tmpfiles.d/%{name}.conf
%attr(644,root,root) %{_tmpfilesdir}/%{name}.conf
%else
%attr(755,root,root) %{_initrddir}/rhsmcertd
%endif
@ -391,8 +402,7 @@ fi
%preun
if [ $1 -eq 0 ] ; then
%if %use_systemd
/bin/systemctl --no-reload disable rhsmcertd.service > /dev/null 2>&1 || :
/bin/systemctl stop rhsmcertd.service > /dev/null 2>&1 || :
%systemd_preun rhsmcertd.service
%else
/sbin/service rhsmcertd stop >/dev/null 2>&1
/sbin/chkconfig --del rhsmcertd
@ -405,13 +415,49 @@ fi
%postun
%if %use_systemd
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -eq 1 ] ; then
/bin/systemctl try-restart rhsmcertd.service >/dev/null 2>&1 || :
fi
%systemd_postun_with_restart rhsmcertd.service
%endif
%changelog
* Thu Feb 27 2014 Alex Wood <awood@redhat.com> 1.11.1-1
- 1021069: Add reference to network usage info. (alikins@redhat.com)
- latest strings from zanata 1.11.X branch (alikins@redhat.com)
- 1061923: Remove trailing period from privacy URL (wpoteat@redhat.com)
- 1039913: rhsm-debug updates and fixes (alikins@redhat.com)
- 1061407: don't allow some translations (ckozak@redhat.com)
- 1055664: rhsm-debug now follows more config paths (alikins@redhat.com)
- 1038242: add anaconda.pid check before chroot (alikins@redhat.com)
- 1035115: Update product id certs (alikins@redhat.com)
- 864195: New output line for subscribe --auto if it can't cover all products
(wpoteat@redhat.com)
- 1060727: Changes to rhsm-debug for sos report (wpoteat@redhat.com)
- 1044596: Don't match beta product tags for release (alikins@redhat.com)
- 851325: Tweak activation key checkbox to left (alikins@redhat.com)
- Use systemd RPM macros to make life easier. (awood@redhat.com)
- 958016: use rpm %%{optflags} and _hardended_build (alikins@redhat.com)
* Tue Feb 11 2014 ckozak <ckozak@redhat.com> 1.10.14-1
- Use glob for finding entitlement certs to remove. (dgoodwin@redhat.com)
- Make sure entitlement cert directory exists before we clean it out.
(dgoodwin@redhat.com)
- safer default args in AsyncWidgetUpdater (ckozak@redhat.com)
- use enumerate instead of confusing myself (ckozak@redhat.com)
- Pull in latest strings from zanata (bkearney@redhat.com)
- make sure entitlement has a pool before reading it (ckozak@redhat.com)
- quickly load preferences (ckozak@redhat.com)
- 1061937: preference changes occur in the background (ckozak@redhat.com)
- use existing signals (ckozak@redhat.com)
- simplify preferences window (ckozak@redhat.com)
- Fix test failure if run on system that is registered. (dgoodwin@redhat.com)
- 1061393: Don't allow subscription-manager string to be translated
(ckozak@redhat.com)
- 1016427: On string was missed from the extraction (bkearney@redhat.com)
- 1058495: productid yum errors on yum remove (alikins@redhat.com)
- 1026501: Preserve PKI directories and have rpm own them.
(dgoodwin@redhat.com)
- 1058374: Fix crash on exception in managergui._show_buttons
(ckozak@redhat.com)
* Mon Feb 03 2014 ckozak <ckozak@redhat.com> 1.10.13-1
- 1060917: catch exception thrown in firstboot (ckozak@redhat.com)
- Extract the latest strings (bkearney@redhat.com)
@ -520,14 +566,14 @@ fi
* Fri Dec 06 2013 ckozak <ckozak@redhat.com> 1.10.8-1
- 1030604: Handle 400 code for add override (mstead@redhat.com)
- Use backed to ensure a refreshed Overrides object (mstead@redhat.com)
- 1034574: Alternate message based on why no repos exist in GUI
- 1034574: Alternate message based on why no repos exist in GUI
(mstead@redhat.com)
- 1034396: No longer require entitlements to run repo-override command
(mstead@redhat.com)
- 1033741: Refresh Overrides CP connection when dialog is shown
(mstead@redhat.com)
- 1033690: Updated repo-overrides not supported message (mstead@redhat.com)
- 1034649: Only allow repolib to update override cache if supported by the
- 1034649: Only allow repolib to update override cache if supported by the
server (mstead@redhat.com)
- 1032673: Warn on add override if repo doesn't exist (mstead@redhat.com)
- 1030996: Fixed usage text for repo-override add/remove options