From aa066100460c35c95e814cf641d5067ddbc7a15a Mon Sep 17 00:00:00 2001 From: Alex Wood Date: Fri, 15 Jul 2016 10:07:38 -0400 Subject: [PATCH] Update subscription-manager to 1.18.1-1 Resolves: #1353662 - Explicitly use ConsumerIdentity keypath and certpath methods Resolves: #1335371 - Allow auto-attach in GUI when system status is partial Resolves: #1335537 - Fix typo in proxy message (wpoteat@redhat.com) Resolves: #1330054 - Set hostname, port and prefix on default button clicked Resolves: #1325083 - Fix available sort order (csnyder@redhat.com) Resolves: #874735 - Support fact collection of multiple ips per interface Resolves: #1337817 - The 'Start-End Date' of expired subscription is not in red status Resolves: #1319678 - Alter the return message for removing entitlements at server Resolves: #1328729 - add registry.redhat.io to default registry_hostnames Resolves: #1283749 - Change some registration dialogs to error (wpoteat@redhat.com) --- .gitignore | 1 + sources | 2 +- subscription-manager.spec | 448 +++++++++++++++++++++++--------------- 3 files changed, 277 insertions(+), 174 deletions(-) diff --git a/.gitignore b/.gitignore index 4f4b8ad..946c4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /subscription-manager-1.17.3.tar.gz /subscription-manager-1.17.4.tar.gz /subscription-manager-1.17.6.tar.gz +/subscription-manager-1.18.1.tar.gz diff --git a/sources b/sources index 704c767..1724927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cbda9472c083ddc34fdc7ed42d4c23d subscription-manager-1.17.6.tar.gz +8e6501f78bc2b130da63a2f03c260185 subscription-manager-1.18.1.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 7a92746..3c8d086 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -7,7 +7,6 @@ %global use_initial_setup 1 %global rhsm_plugins_dir /usr/share/rhsm-plugins %global use_gtk3 %use_systemd -%global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release |%{__sed} -s 's/7.//') %if 0%{?rhel} == 7 %global use_initial_setup 1 @@ -20,17 +19,17 @@ %global use_firstboot 1 %endif -%global use_dnf (0%{?fedora} && 0%{?fedora} >= 22) +# SLES +%if 0%{?sles_version} +%global use_initial_setup 0 +%global use_firstboot 1 +%endif +%global use_dnf (0%{?fedora} && 0%{?fedora} >= 22) %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 -%global el5 1 -%endif - %if %{has_ostree} %define install_ostree INSTALL_OSTREE_PLUGIN=true %else @@ -61,11 +60,12 @@ %endif Name: subscription-manager -Version: 1.17.6 +Version: 1.18.1 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base License: GPLv2 +URL: http://www.candlepinproject.org/ # How to create the source tarball: # @@ -73,23 +73,32 @@ License: GPLv2 # yum install tito # tito build --tag subscription-manager-$VERSION-$RELEASE --tgz Source0: %{name}-%{version}.tar.gz -URL: http://www.candlepinproject.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python-ethtool Requires: python-iniparse Requires: virt-what -Requires: python-rhsm >= 1.17.0 +Requires: python-rhsm >= 1.18.0 +%if 0%{?sles_version} +Requires: dbus-1-python +%else Requires: dbus-python +%endif Requires: yum >= 3.2.29-73 +%if !0%{?sles_version} Requires: usermode +%endif Requires: python-dateutil %if %use_gtk3 Requires: gobject-introspection Requires: pygobject3-base %else +%if 0%{?sles_version} +Requires: python-gobject2 +%else Requires: pygobject2 %endif +%endif # There's no dmi to read on these arches, so don't pull in this dep. %ifnarch ppc ppc64 s390 s390x @@ -101,19 +110,31 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd %else +%if 0%{?sles_version} +Requires(post): aaa_base +Requires(preun): aaa_base +%else Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts %endif +%endif BuildRequires: python-devel +BuildRequires: python-setuptools BuildRequires: gettext BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: desktop-file-utils +%if 0%{?fedora} || 0%{?rhel} BuildRequires: redhat-lsb +%endif BuildRequires: scrollkeeper +%if 0%{?sles_version} +BuildRequires: gconf2-devel +%else BuildRequires: GConf2-devel +%endif %if %use_gtk3 BuildRequires: gtk3-devel %else @@ -124,35 +145,12 @@ BuildRequires: gtk2-devel BuildRequires: systemd %endif - %description The Subscription Manager package provides programs and libraries to allow users 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 -Requires: %{name} = %{version}-%{release} - -%description -n subscription-manager-plugin-ostree -Enables handling of content of type 'ostree' in any certificates -from the server. Populates /ostree/repo/config as well as updates -the remote in the currently deployed .origin file. - -%files -n subscription-manager-plugin-ostree -%defattr(-,root,root,-) -%{_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-plugin-container Summary: A plugin for handling container content. Group: System Environment/Base @@ -162,15 +160,6 @@ Requires: %{name} = %{version}-%{release} Enables handling of content of type 'containerImage' in any certificates from the server. Populates /etc/docker/certs.d appropriately. -%files -n subscription-manager-plugin-container -%defattr(-,root,root,-) -%{_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 @@ -203,31 +192,6 @@ This package contains a GTK+ graphical interface for configuring and registering a system with a Red Hat Entitlement platform and manage subscriptions. -%if %use_firstboot -%package -n subscription-manager-firstboot -Summary: Firstboot screens for subscription manager -Group: System Environment/Base -Requires: %{name}-gui = %{version}-%{release} -Requires: rhn-setup-gnome - -# Fedora can figure this out automatically, but RHEL cannot: -Requires: librsvg2 - -%description -n subscription-manager-firstboot -This package contains the firstboot screens for subscription-manager. -%endif - -%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-gui >= 0.3.9.24-1 -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 @@ -245,6 +209,7 @@ Requires: subscription-manager-migration-data This package contains scripts that aid in moving to certificate based subscriptions + %if %use_dnf %package -n dnf-plugin-subscription-manager Summary: Subscription Manager plugins for DNF @@ -256,6 +221,52 @@ Requires: dnf >= 1.0.0 Subscription Manager plugins for DNF, contains subscription-manager and product-id plugins. %endif + +%if %use_firstboot +%package -n subscription-manager-firstboot +Summary: Firstboot screens for subscription manager +Group: System Environment/Base +Requires: %{name}-gui = %{version}-%{release} +Requires: rhn-setup-gnome + +# Fedora can figure this out automatically, but RHEL cannot: +Requires: librsvg2 + +%description -n subscription-manager-firstboot +This package contains the firstboot screens for subscription-manager. +%endif + + +%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-gui >= 0.3.9.24-1 +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 + + +%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 +Requires: %{name} = %{version}-%{release} + +%description -n subscription-manager-plugin-ostree +Enables handling of content of type 'ostree' in any certificates +from the server. Populates /ostree/repo/config as well as updates +the remote in the currently deployed .origin file. +%endif + + %prep %setup -q @@ -266,68 +277,50 @@ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ %install rm -rf %{buildroot} make -f Makefile install VERSION=%{version}-%{release} \ - PREFIX=%{buildroot} MANPATH=%{_mandir} PYTHON_SITELIB=%{python_sitelib} \ - OS_VERSION=%{?fedora}%{?rhel} OS_DIST=%{dist} \ + PREFIX=%{buildroot} PYTHON_SITELIB=%{python_sitelib} \ + OS_VERSION=%{?fedora}%{?rhel}%{?sles_version} OS_DIST=%{dist} \ %{?install_ostree} %{?post_boot_tool} %{?gtk_version} \ %{?install_yum_plugins} %{?install_dnf_plugins} -desktop-file-validate \ - %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop - -desktop-file-validate \ - %{buildroot}/usr/share/applications/subscription-manager-gui.desktop +desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop %find_lang rhsm %find_lang %{name} --with-gnome -# fix timestamps on our byte compiled files so them match across arches +# fix timestamps on our byte compiled files so they match across arches find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; # fake out the redhat.repo file -mkdir %{buildroot}%{_sysconfdir}/yum.repos.d +%{__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 +%{__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 +%{__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 +%{__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} || : - -%postun -n subscription-manager-gui -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - scrollkeeper-update -q || : -fi - -%posttrans -n subscription-manager-gui -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %clean rm -rf %{buildroot} + # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' %files -f rhsm.lang %defattr(-,root,root,-) - -# executables %attr(755,root,root) %{_sbindir}/subscription-manager # symlink to console-helper +%if !0%{?sles_version} %{_bindir}/subscription-manager +%endif %attr(755,root,root) %{_bindir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker @@ -342,20 +335,20 @@ rm -rf %{buildroot} %endif # our config dirs and files -%attr(755,root,root) %dir %{_sysconfdir}/rhsm -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/rhsm/logging.conf - -%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(755,root,root) %dir %{_sysconfdir}/rhsm +%attr(755,root,root) %dir %{_sysconfdir}/rhsm/facts +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/rhsm/logging.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.SubscriptionManager.conf # PAM config +%if !0%{?sles_version} %{_sysconfdir}/pam.d/subscription-manager %{_sysconfdir}/security/console.apps/subscription-manager +%endif # remove the repo file when we are deleted %ghost %{_sysconfdir}/yum.repos.d/redhat.repo @@ -370,17 +363,14 @@ rm -rf %{buildroot} %attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd %{_datadir}/dbus-1/system-services/com.redhat.SubscriptionManager.service - -# /var %attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/spool/rhsm/debug %attr(755,root,root) %dir %{_var}/run/rhsm -%attr(755,root,root) %dir %{_var}/lib/rhsm -%attr(755,root,root) %dir %{_var}/lib/rhsm/facts -%attr(755,root,root) %dir %{_var}/lib/rhsm/packages -%attr(755,root,root) %dir %{_var}/lib/rhsm/cache +%attr(750,root,root) %dir %{_var}/lib/rhsm +%attr(750,root,root) %dir %{_var}/lib/rhsm/facts +%attr(750,root,root) %dir %{_var}/lib/rhsm/packages +%attr(750,root,root) %dir %{_var}/lib/rhsm/cache -# bash completion scripts %{_sysconfdir}/bash_completion.d/subscription-manager %{_sysconfdir}/bash_completion.d/rct %{_sysconfdir}/bash_completion.d/rhsm-debug @@ -388,37 +378,32 @@ rm -rf %{buildroot} %{_sysconfdir}/bash_completion.d/rhsm-icon %{_sysconfdir}/bash_completion.d/rhsmcertd - -# code -# python package dirs -%dir %{_datadir}/rhsm -%dir %{_datadir}/rhsm/subscription_manager -%dir %{_datadir}/rhsm/subscription_manager/api -%dir %{_datadir}/rhsm/subscription_manager/branding -%dir %{_datadir}/rhsm/subscription_manager/model -%dir %{_datadir}/rhsm/subscription_manager/plugin +%dir %{python_sitelib}/ +%dir %{python_sitelib}/subscription_manager +%dir %{python_sitelib}/subscription_manager/api +%dir %{python_sitelib}/subscription_manager/branding +%dir %{python_sitelib}/subscription_manager/model +%dir %{python_sitelib}/subscription_manager/plugin # code, python modules and packages -%{_datadir}/rhsm/subscription_manager/*.py* - -%{_datadir}/rhsm/subscription_manager/api/*.py* -%{_datadir}/rhsm/subscription_manager/branding/*.py* +%{python_sitelib}/subscription_manager-*.egg-info/* +%{python_sitelib}/subscription_manager/*.py* +%{python_sitelib}/subscription_manager/api/*.py* +%{python_sitelib}/subscription_manager/branding/*.py* +%{python_sitelib}/subscription_manager/model/*.py* +%{python_sitelib}/subscription_manager/plugin/*.py* # our gtk2/gtk3 compat modules -%dir %{_datadir}/rhsm/subscription_manager/ga_impls -%{_datadir}/rhsm/subscription_manager/ga_impls/__init__.py* +%dir %{python_sitelib}/subscription_manager/ga_impls +%{python_sitelib}/subscription_manager/ga_impls/__init__.py* %if %use_gtk3 -%{_datadir}/rhsm/subscription_manager/ga_impls/ga_gtk3.py* +%{python_sitelib}/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* +%dir %{python_sitelib}/subscription_manager/ga_impls/ga_gtk2 +%{python_sitelib}/subscription_manager/ga_impls/ga_gtk2/*.py* %endif -%{_datadir}/rhsm/subscription_manager/model/*.py* - -%{_datadir}/rhsm/subscription_manager/plugin/*.py* - # subscription-manager plugins %dir %{rhsm_plugins_dir} %dir %{_sysconfdir}/rhsm/pluginconf.d @@ -430,21 +415,14 @@ rm -rf %{buildroot} %{_prefix}/lib/yum-plugins/product-id.py* %{_prefix}/lib/yum-plugins/search-disabled-repos.py* - # Incude rt CLI tool -%dir %{_datadir}/rhsm/rct -%{_datadir}/rhsm/rct/__init__.py* -%{_datadir}/rhsm/rct/cli.py* -%{_datadir}/rhsm/rct/*commands.py* -%{_datadir}/rhsm/rct/printing.py* -%{_datadir}/rhsm/rct/version.py* +%dir %{python_sitelib}/rct +%{python_sitelib}/rct/*.py* %attr(755,root,root) %{_bindir}/rct # Include consumer debug CLI tool -%dir %{_datadir}/rhsm/rhsm_debug -%{_datadir}/rhsm/rhsm_debug/__init__.py* -%{_datadir}/rhsm/rhsm_debug/cli.py* -%{_datadir}/rhsm/rhsm_debug/*commands.py* +%dir %{python_sitelib}/rhsm_debug +%{python_sitelib}/rhsm_debug/*.py* %attr(755,root,root) %{_bindir}/rhsm-debug %doc @@ -460,16 +438,22 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %attr(755,root,root) %{_sbindir}/subscription-manager-gui # symlink to console-helper +%if !0%{?sles_version} %{_bindir}/subscription-manager-gui +%endif %{_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/ui/*.ui -%{_datadir}/rhsm/subscription_manager/gui/data/glade/*.glade -%{_datadir}/rhsm/subscription_manager/gui/data/icons/*.svg + +%dir %{python_sitelib}/subscription_manager/gui +%dir %{python_sitelib}/subscription_manager/gui/data +%dir %{python_sitelib}/subscription_manager/gui/data/ui +%dir %{python_sitelib}/subscription_manager/gui/data/glade +%dir %{python_sitelib}/subscription_manager/gui/data/icons + +%{python_sitelib}/subscription_manager/gui/*.py* +%{python_sitelib}/subscription_manager/gui/data/ui/*.ui +%{python_sitelib}/subscription_manager/gui/data/glade/*.glade +%{python_sitelib}/subscription_manager/gui/data/icons/*.svg + %{_datadir}/applications/subscription-manager-gui.desktop %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -481,13 +465,12 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/appdata/subscription-manager-gui.appdata.xml -# code and modules -%{_datadir}/rhsm/subscription_manager/gui/*.py* - # gui system config files %{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +%if !0%{?sles_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui +%endif %{_sysconfdir}/bash_completion.d/subscription-manager-gui %doc @@ -496,6 +479,40 @@ rm -rf %{buildroot} %doc LICENSE +%files -n subscription-manager-migration +%defattr(-,root,root,-) +%dir %{python_sitelib}/subscription_manager/migrate +%{python_sitelib}/subscription_manager/migrate/*.py* +%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm + +%doc +%{_mandir}/man8/rhn-migrate-classic-to-rhsm.8* +%doc LICENSE +%if 0%{?fedora} > 14 +%doc README.Fedora +%endif + + +%files -n subscription-manager-plugin-container +%defattr(-,root,root,-) +%{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf +%{rhsm_plugins_dir}/container_content.py* +%{python_sitelib}/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 + + +%if %has_ostree +%files -n subscription-manager-plugin-ostree +%defattr(-,root,root,-) +%{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf +%{rhsm_plugins_dir}/ostree_content.py* +%{python_sitelib}/subscription_manager/plugin/ostree/*.py* +%endif + + %if %use_initial_setup %files -n subscription-manager-initial-setup-addon %defattr(-,root,root,-) @@ -512,25 +529,13 @@ rm -rf %{buildroot} %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/*.py* %endif + %if %use_firstboot %files -n subscription-manager-firstboot %defattr(-,root,root,-) %{_datadir}/rhn/up2date_client/firstboot/rhsm_login.py* %endif -%files -n subscription-manager-migration -%defattr(-,root,root,-) -%dir %{_datadir}/rhsm/subscription_manager/migrate -%{_datadir}/rhsm/subscription_manager/migrate/*.py* -%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm - -%doc -%{_mandir}/man8/rhn-migrate-classic-to-rhsm.8* -%doc LICENSE -#only install this file on Fedora -%if 0%{?fedora} > 14 -%doc README.Fedora -%endif %if %use_dnf %files -n dnf-plugin-subscription-manager @@ -538,6 +543,7 @@ rm -rf %{buildroot} %{python_sitelib}/dnf-plugins/* %endif + %post %if %use_systemd /bin/systemctl enable rhsmcertd.service >/dev/null 2>&1 || : @@ -548,15 +554,19 @@ rm -rf %{buildroot} %endif if [ -x /bin/dbus-send ] ; then - dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : + dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : fi %if !%use_systemd - if [ "$1" -eq "2" ] ; then - /sbin/service rhsmcertd condrestart >/dev/null 2>&1 || : - fi +if [ "$1" -eq "2" ] ; then + /sbin/service rhsmcertd condrestart >/dev/null 2>&1 || : +fi %endif +%post -n subscription-manager-gui +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + %preun if [ $1 -eq 0 ] ; then %if %use_systemd @@ -576,7 +586,99 @@ fi %systemd_postun_with_restart rhsmcertd.service %endif +%postun -n subscription-manager-gui +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + scrollkeeper-update -q || : +fi + +%posttrans -n subscription-manager-gui +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %changelog +* Fri Jul 15 2016 Alex Wood 1.18.1-1 +- Bump version to 1.18 (vrjain@redhat.com) + +* Tue Jul 12 2016 Vritant Jain 1.17.9-1 +- 1353662: Explicitly use ConsumerIdentity keypath and certpath methods + (csnyder@redhat.com) +- 1268307, 1268043, 1257179: Disable back button on registration dialog when + there is no back (wpoteat@redhat.com) +- 1335371: Allow auto-attach in GUI when system status is partial + (wpoteat@redhat.com) + +* Wed Jun 22 2016 Vritant Jain 1.17.8-1 +- 1335537: Fix typo in proxy message (wpoteat@redhat.com) +- Remove sys.path shenanigans that break yum imports. (awood@redhat.com) +- 1330054: Set hostname, port and prefix on default button clicked + (csnyder@redhat.com) +- 1325083: Fix available sort order (csnyder@redhat.com) +- 874735: Support fact collection of multiple ips per interface + (csnyder@redhat.com) +- Added basic SLES compatibility Tested against SLES 11 SP3 + (darinlively@gmail.com) +- drop xtraceback nose plugin usage as it is not available as an PRM + (bcourt@redhat.com) +- Fix Flake8 Errors (bcourt@redhat.com) +- 1337817: The 'Start-End Date' of expired subscription is not in red status + when the subscription expired. (vrjain@redhat.com) +- 1319678: Alter the return message for removing entitlements at server + (wpoteat@redhat.com) + +* Fri Jun 03 2016 Vritant Jain 1.17.7-1 +- 1297493, 1297485: Restrict visibility of subscription-manager caches. + (awood@redhat.com) +- pull translations from zanata 1.17.X, after pushing 1.16.X translations to + 1.17.X and pushing keys file (vrjain@redhat.com) +- update keys using make gettext (vrjain@redhat.com) +- pull translations from zanata 1.16.X (vrjain@redhat.com) +- 1328729: add registry.redhat.io to default registry_hostnames + (vrjain@redhat.com) +- Add lxml requirement to test-requirements. (awood@redhat.com) +- Add noop implementation for deprecated Makefile target. (awood@redhat.com) +- Force version to be converted to a string. (awood@redhat.com) +- Correct incorrectly defined options for custom install command. + (awood@redhat.com) +- Let setup.py handle populating version.py (awood@redhat.com) +- Eliminate loading modules from /usr/share/rhsm. (awood@redhat.com) +- Switch to using lxml for linting. (awood@redhat.com) +- Handle pep8/flake8 not being available in build environments. + (awood@redhat.com) +- Exclude OSTree packages from installation by default. (awood@redhat.com) +- Make XPath searching 2.6 compatible. (awood@redhat.com) +- Fix errors found by new linters (awood@redhat.com) +- Don't use super() with ElementTree.XMLParser. (awood@redhat.com) +- Add some comments on build philosophy. (awood@redhat.com) +- Disable version.py generation via setup.py. (awood@redhat.com) +- Reorganize spec file. (awood@redhat.com) +- Address issue where Flake8 checked the same file multiple times. + (awood@redhat.com) +- Makefile changes. (awood@redhat.com) +- Consolidate targets in Makefile. (awood@redhat.com) +- Pare down the Makefile. (awood@redhat.com) +- Remove items from Makefile now handled by setuptools. (awood@redhat.com) +- Align Makefile with changes made in setup.py. (awood@redhat.com) +- Remove docs for long deprecated program. (awood@redhat.com) +- Fix deprecated XPath expression. Remove call to missing command. + (awood@redhat.com) +- Add icon and Glade files files into setup.py (awood@redhat.com) +- Add desktop files to setuptools build. (awood@redhat.com) +- Merge translations back into desktop file. (awood@redhat.com) +- Add linter to search for undefined Glade handlers. (awood@redhat.com) +- Check for use of undefined widgets (awood@redhat.com) +- Use *args for multiple glob searches. (awood@redhat.com) +- Scan .glade files not .ui files for problematic constructs. + (awood@redhat.com) +- Detect debug imports and flag them. (awood@redhat.com) +- Use extensions that won't be confused for source files. (awood@redhat.com) +- Simplify AST checking and make it more flexible. (awood@redhat.com) +- Use AST parsing to find constructs that confuse xgettext. (awood@redhat.com) +- Add linting commands. (awood@redhat.com) +- Use some distutils provided utilities. Refactor. (awood@redhat.com) +- Begin process of moving to distutils for building. (awood@redhat.com) +- 1283749: Change some registration dialogs to error (wpoteat@redhat.com) + * Mon May 09 2016 Vritant Jain 1.17.6-1 - 1268094: Avoid traceback on unreg with >1 sub (alikins@redhat.com) - 1329397: github issue #1409 (stas-fomin@yandex.ru)