Update subscription-manager to 1.16.0-1
Resolves: #1136163 - Ignore pythonpath to avoid selinux AVCs (alikins@redhat.com) Resolves: #985157 - Display the URL that is the registration target (wpoteat@redhat.com) Resolves: #1234413 - lower log level of rhsmd RHN messages (alikins@redhat.com) Resolves: #1241247 - Fix ga ImportError in rhsmcertd (alikins@redhat.com) Resolves: #1232232 - Add supported API to enable content repositories. (awood@redhat.com) Resolves: #1241184 - Updated Makefile to prevent version string clobbering Resolves: #1240801 - Use latest initial-setup API (alikins@redhat.com) Resolves: #1232508 - file_monitor is no longer a gobject (alikins@redhat.com)
This commit is contained in:
Alex Wood
parent
9fdd0a1542
commit
7d80801520
1
.gitignore
vendored
1
.gitignore
vendored
@ -53,3 +53,4 @@
|
||||
/subscription-manager-1.14.3.tar.gz
|
||||
/subscription-manager-1.14.6.tar.gz
|
||||
/subscription-manager-1.15.1.tar.gz
|
||||
/subscription-manager-1.16.0.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
8b5a72bf5e20b069c884a0e3b810bf79 subscription-manager-1.15.1.tar.gz
|
||||
866120fb0df63ed671af5d127d49d91d subscription-manager-1.16.0.tar.gz
|
||||
|
||||
@ -5,10 +5,11 @@
|
||||
%global has_ostree %use_systemd
|
||||
%global use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6)
|
||||
%global rhsm_plugins_dir /usr/share/rhsm-plugins
|
||||
%global use_gtk3 0
|
||||
|
||||
%global use_gtk3 %use_systemd
|
||||
%global use_initial_setup %use_systemd
|
||||
|
||||
%global _hardened_build 1
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
|
||||
|
||||
# A couple files are for RHEL 5 only:
|
||||
%if 0%{?rhel} == 5
|
||||
@ -21,9 +22,22 @@
|
||||
%define install_ostree INSTALL_OSTREE_PLUGIN=false
|
||||
%endif
|
||||
|
||||
# makefile will guess, but be specific.
|
||||
%if %{use_gtk3}
|
||||
%define gtk_version GTK_VERSION=3
|
||||
%else
|
||||
%define gtk_version GTK_VERSION=2
|
||||
%endif
|
||||
|
||||
%if %{use_initial_setup}
|
||||
%define post_boot_tool INSTALL_INITIAL_SETUP=true INSTALL_FIRSTBOOT=false
|
||||
%else
|
||||
%define post_boot_tool INSTALL_INITIAL_SETUP=false INSTALL_FIRSTBOOT=true
|
||||
%endif
|
||||
|
||||
Name: subscription-manager
|
||||
Version: 1.15.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.16.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools and libraries for subscription and repository management
|
||||
Group: System Environment/Base
|
||||
License: GPLv2
|
||||
@ -40,7 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: python-ethtool
|
||||
Requires: python-iniparse
|
||||
Requires: virt-what
|
||||
Requires: python-rhsm >= 1.15.0
|
||||
Requires: python-rhsm >= 1.16.0
|
||||
Requires: dbus-python
|
||||
Requires: yum >= 3.2.19-15
|
||||
Requires: usermode
|
||||
@ -178,6 +192,18 @@ Requires: librsvg2
|
||||
%description -n subscription-manager-firstboot
|
||||
This package contains the firstboot screens for subscription-manager.
|
||||
|
||||
%if %use_initial_setup
|
||||
%package -n subscription-manager-initial-setup-addon
|
||||
Summary: initial-setup screens for subscription-manager
|
||||
Group: System Environment/Base
|
||||
Requires: %{name}-gui = %{version}-%{release}
|
||||
Requires: initial-setup
|
||||
Obsoletes: subscription-manager-firstboot < 1.15.3-1
|
||||
|
||||
%description -n subscription-manager-initial-setup-addon
|
||||
This package contains the initial-setup screens for subscription-manager.
|
||||
%endif
|
||||
|
||||
%package -n subscription-manager-migration
|
||||
Summary: Migration scripts for moving to certificate based subscriptions
|
||||
Group: System Environment/Base
|
||||
@ -198,11 +224,11 @@ subscriptions
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
|
||||
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" %{?gtk_version}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} OS_VERSION=%{?fedora}%{?rhel} %{?install_ostree}
|
||||
make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} OS_VERSION=%{?fedora}%{?rhel} OS_DIST=%{dist} %{?gtk_version} %{?install_ostree} %{?post_boot_tool}
|
||||
|
||||
desktop-file-validate \
|
||||
%{buildroot}/etc/xdg/autostart/rhsm-icon.desktop
|
||||
@ -296,6 +322,7 @@ rm -rf %{buildroot}
|
||||
# yum plugin config
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/subscription-manager.conf
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/product-id.conf
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/yum/pluginconf.d/search-disabled-repos.conf
|
||||
|
||||
# misc system config
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager
|
||||
@ -331,8 +358,22 @@ rm -rf %{buildroot}
|
||||
|
||||
# code, python modules and packages
|
||||
%{_datadir}/rhsm/subscription_manager/*.py*
|
||||
|
||||
%{_datadir}/rhsm/subscription_manager/branding/*.py*
|
||||
|
||||
# our gtk2/gtk3 compat modules
|
||||
%dir %{_datadir}/rhsm/subscription_manager/ga_impls
|
||||
%{_datadir}/rhsm/subscription_manager/ga_impls/__init__.py*
|
||||
|
||||
%if %use_gtk3
|
||||
%{_datadir}/rhsm/subscription_manager/ga_impls/ga_gtk3.py*
|
||||
%else
|
||||
%dir %{_datadir}/rhsm/subscription_manager/ga_impls/ga_gtk2
|
||||
%{_datadir}/rhsm/subscription_manager/ga_impls/ga_gtk2/*.py*
|
||||
%endif
|
||||
|
||||
%{_datadir}/rhsm/subscription_manager/model/*.py*
|
||||
|
||||
%{_datadir}/rhsm/subscription_manager/plugin/*.py*
|
||||
|
||||
# subscription-manager plugins
|
||||
@ -344,6 +385,7 @@ rm -rf %{buildroot}
|
||||
# but yum plugins seem to normally be sent to /usr/lib/:
|
||||
%{_prefix}/lib/yum-plugins/subscription-manager.py*
|
||||
%{_prefix}/lib/yum-plugins/product-id.py*
|
||||
%{_prefix}/lib/yum-plugins/search-disabled-repos.py*
|
||||
|
||||
|
||||
# Incude rt CLI tool
|
||||
@ -379,8 +421,11 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/rhsm-icon
|
||||
%dir %{_datadir}/rhsm/subscription_manager/gui
|
||||
%dir %{_datadir}/rhsm/subscription_manager/gui/data
|
||||
%dir %{_datadir}/rhsm/subscription_manager/gui/data/ui
|
||||
%dir %{_datadir}/rhsm/subscription_manager/gui/data/glade
|
||||
%dir %{_datadir}/rhsm/subscription_manager/gui/data/icons
|
||||
%{_datadir}/rhsm/subscription_manager/gui/data/*.glade
|
||||
%{_datadir}/rhsm/subscription_manager/gui/data/ui/*.ui
|
||||
%{_datadir}/rhsm/subscription_manager/gui/data/glade/*.glade
|
||||
%{_datadir}/rhsm/subscription_manager/gui/data/icons/*.svg
|
||||
%{_datadir}/applications/subscription-manager-gui.desktop
|
||||
%{_datadir}/icons/hicolor/16x16/apps/*.png
|
||||
@ -407,13 +452,26 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/man8/rhsm-icon.8*
|
||||
%doc LICENSE
|
||||
|
||||
|
||||
%if %use_initial_setup
|
||||
%files -n subscription-manager-initial-setup-addon
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/
|
||||
%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/
|
||||
%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/
|
||||
%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/
|
||||
%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/*.py*
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/*.py*
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/*.ui
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/*.py*
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/*.py*
|
||||
%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/*.py*
|
||||
%else
|
||||
|
||||
%files -n subscription-manager-firstboot
|
||||
%defattr(-,root,root,-)
|
||||
# RHEL 6 needs a different location for firstboot modules:
|
||||
%if %use_old_firstboot
|
||||
%{_datadir}/rhn/up2date_client/firstboot/rhsm_login.py*
|
||||
%else
|
||||
%{_datadir}/firstboot/modules/rhsm_login.py*
|
||||
%endif
|
||||
|
||||
%files -n subscription-manager-migration
|
||||
@ -469,8 +527,54 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.15.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
* Fri Jul 24 2015 Alex Wood <awood@redhat.com> 1.16.0-1
|
||||
- Bump version to 1.16 (crog@redhat.com)
|
||||
- Changed initial-setup-addon package requirement from subman to subman-gui
|
||||
(crog@redhat.com)
|
||||
- Cast product.id to int for sort in cat-cert (alikins@redhat.com)
|
||||
- 1136163: Ignore pythonpath to avoid selinux AVCs (alikins@redhat.com)
|
||||
- 985157: Display the URL that is the registration target (wpoteat@redhat.com)
|
||||
- 1234413: lower log level of rhsmd RHN messages (alikins@redhat.com)
|
||||
|
||||
* Fri Jul 10 2015 Chris Rog <crog@redhat.com> 1.15.7-1
|
||||
- Merge pull request #1219 from candlepin/alikins/1241247_ga_ImportError
|
||||
(ceiu@cericlabs.com)
|
||||
- Merge pull request #1211 from candlepin/awood/1232232-enable-repos
|
||||
(alikins@redhat.com)
|
||||
- 1241247: Fix ga ImportError in rhsmcertd (alikins@redhat.com)
|
||||
- Merge pull request #1214 from
|
||||
candlepin/alikins/prevent_nose_loading_ga_impls_directly (awood@redhat.com)
|
||||
- Add comment about the request_injection decorator. (awood@redhat.com)
|
||||
- Prevent nose looking for tests in sub_manager/ (alikins@redhat.com)
|
||||
- Remove assertIn as that test is not in Python 2.6. (awood@redhat.com)
|
||||
- Move API dependency injection out of module scope. (awood@redhat.com)
|
||||
- 1232232: Add supported API to enable content repositories. (awood@redhat.com)
|
||||
|
||||
* Wed Jul 08 2015 Chris Rog <crog@redhat.com> 1.15.6-1
|
||||
- 1241184: Updated Makefile to prevent version string clobbering
|
||||
(crog@redhat.com)
|
||||
|
||||
* Tue Jul 07 2015 Adrian Likins <alikins@redhat.com> 1.15.5-1
|
||||
- 1240801: Use latest initial-setup API (alikins@redhat.com)
|
||||
|
||||
* Tue Jul 07 2015 Adrian Likins <alikins@redhat.com> 1.15.4-1
|
||||
- Make initial-setup rpm Obsolete firstboot rpm. (alikins@redhat.com)
|
||||
|
||||
* Mon Jul 06 2015 Adrian Likins <alikins@redhat.com> 1.15.3-1
|
||||
- 1232508: file_monitor is no longer a gobject (alikins@redhat.com)
|
||||
- Add 'subscription-manager-initial-setup-addon' sub package (alikins@redhat.com)
|
||||
- Make 'subscription-manager-firstboot' optional (alikins@redhat.com)
|
||||
- Make 'firstboot' and 'initial-setup' RHEL version dependent (alikins@redhat.com)
|
||||
- Add initial-setup modules. (alikins@redhat.com)
|
||||
- Port gui from gtk2 to gtk3 via 'ga' (alikins@redhat.com)
|
||||
- Make gui support gtk2 and gtk3 (alikins@redhat.com)
|
||||
- Add module 'ga' ('gtk any') as Gtk ver abstraction (alikins@redhat.com)
|
||||
- Add search-disabled-repos plugin. (vmukhame@redhat.com)
|
||||
|
||||
* Mon Jun 22 2015 Chris Rog <crog@redhat.com> 1.15.2-1
|
||||
- Added release target for RHEL 7.2 (crog@redhat.com)
|
||||
- Move po compile/install for faster 'install-files' (alikins@redhat.com)
|
||||
- Stop using deprecated Tito settings. (awood@redhat.com)
|
||||
|
||||
* Thu Jun 11 2015 Alex Wood <awood@redhat.com> 1.15.1-1
|
||||
- Don't try to set file attrs on symlinks in spec (alikins@redhat.com)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user