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

Update subscription-manager to 1.21.5-1

Browse Source 
Resolves: #1568609 - Updated man page for --after list option (aparadka@redhat.com)
Resolves: #1560727 - Search for proxy auth message in whole error string
Resolves: #1555384 - get_libexecdir now returns a string instead of bytes
Resolves: #1574706 - Create python2-subscription-manager-rhsm properly
Resolves: #1574529 - Fix rhsmcertd integer overflow on i386 & i686 (csnyder@redhat.com)
This commit is contained in:
Christopher Snyder 2018-06-07 17:58:01 -04:00
parent 5484dbb5a4
commit e4f0a38c4f
3 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -81,3 +81,5 @@
/subscription-manager-cockpit-1.21.3.tar.gz
/subscription-manager-1.21.4.tar.gz
/subscription-manager-cockpit-1.21.4.tar.gz
/subscription-manager-1.21.5.tar.gz
/subscription-manager-cockpit-1.21.5.tar.gz

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (subscription-manager-1.21.4.tar.gz) = 87bdeb04f86f5d1a2cd02d1fcbe41a790b807f005f4d811611c544749ffaea95e1b9d47d2aa509fc79e71ef13e1dd1b12944096a7efba6ee1b3e7223586b2463
SHA512 (subscription-manager-cockpit-1.21.4.tar.gz) = 374ebbb66817dfcfe0ffe6fc0f6eea8a9ff2e150a1ba8f350accd2daabbad6defd4edfaadd29ac8befde68b651ba28090063bf1d7750af460371e60ef4b971d5
SHA512 (subscription-manager-1.21.5.tar.gz) = 2e8feaad484d7626842f4081edd777612fb5bb28bf821411a354c34a0346aa103e6c7758f49535493eb849a6a8ada9737fdef61589abb43dce83fd3d506ec12c
SHA512 (subscription-manager-cockpit-1.21.5.tar.gz) = 606c1f3e426a878935b94e2d955ce635517b365c3cdd6022aa75dc1207b92106509e397ca29c16d3c0d18312f4068a78707b802d2b04ab051908068b3f00675c

49
subscription-manager.spec
View File

@ -123,11 +123,17 @@
%define with_subman_gui WITH_SUBMAN_GUI=false
%endif
%if %{use_cockpit} && !0%{use_subman_gui}
%define with_cockpit WITH_COCKPIT=true
%else
%define with_cockpit WITH_COCKPIT=false
%endif
%define subpackages SUBPACKAGES="%{?include_intentctl:intentctl}"
Name: subscription-manager
Version: 1.21.4
Release: 3%{?dist}
Version: 1.21.5
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
License: GPLv2
@ -496,7 +502,7 @@ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" %{?gtk_version} %{?subpackages} %{?include_intentctl:INCLUDE_INTENTCTL="1"}
%if %{with python2_rhsm}
./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
%endif
%install
@ -510,12 +516,16 @@ make -f Makefile install VERSION=%{version}-%{release} \
%{?install_zypper_plugins} \
%{?with_systemd} \
%{?with_subman_gui} \
%{?with_cockpit} \
%{?subpackages} \
%{?include_intentctl:INCLUDE_INTENTCTL="1"}
%if %{with python2_rhsm}
mkdir -p %{buildroot}%{python2_sitearch}
cp -r %{buildroot}%{python_sitearch}/rhsm %{buildroot}%{python2_sitearch}/rhsm
mkdir -p %{buildroot}%{python2_sitearch}/rhsm
# Build binary extension in Python2 site-packages directory
python2 ./setup.py build_ext --build-lib %{buildroot}%{python2_sitearch} --quiet
# Copy all *.py file from Python3 to Python2 directory
cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm/
%endif
%if 0%{?suse_version}
@ -525,6 +535,10 @@ cp -r %{buildroot}%{python_sitearch}/rhsm %{buildroot}%{python2_sitearch}/rhsm
%if %use_subman_gui
desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop
desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop
%else
%if %use_cockpit
desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-cockpit.desktop
%endif
%endif
%find_lang rhsm
@ -975,6 +989,9 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo
%{_datadir}/cockpit/subscription-manager/po.js
%{_datadir}/cockpit/subscription-manager/node_modules/*
%{_datadir}/metainfo/org.cockpit-project.subscription-manager.metainfo.xml
%if ! %use_subman_gui
%{_datadir}/applications/subscription-manager-cockpit.desktop
%endif
%endif
%post
@ -1051,6 +1068,28 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Thu Jun 07 2018 Christopher Snyder <csnyder@redhat.com> 1.21.5-1
- Fix python-rhsm Provides and Obsoletes (csnyder@redhat.com)
- 1568609: Updated man page for --after list option (aparadka@redhat.com)
- Get Initial Setup Addon to run during installation in Vagrant
(jhnidek@redhat.com)
- ENT-447 Create .desktop file that opens web page with our cockpit plugin
(jhnidek@redhat.com)
- ENT-481 service-level command & options now update intent metadata
(nmoumoul@redhat.com)
- 1560727: Search for proxy auth message in whole error string
(aria.paradkar@gmail.com)
- 1555384: get_libexecdir now returns a string instead of bytes
(aria.paradkar@gmail.com)
- Added generic set/unset and add/remove commands to intentctl
(crog@redhat.com)
- ENT-488 intentctl now warns if running in container (nmoumoul@redhat.com)
- 1574706: Create python2-subscription-manager-rhsm properly
(jhnidek@redhat.com)
- Automatic rebuilding of updates.img on PXE Server (jhnidek@redhat.com)
- 1574529: Fix rhsmcertd integer overflow on i386 & i686 (csnyder@redhat.com)
- Respecting proxy port configured in rhsm.conf (oskar@wycislak.pl)
* Tue May 01 2018 Christopher Snyder <csnyder@redhat.com> 1.21.4-3
- Add dist back to release (csnyder@redhat.com)