diff --git a/.gitignore b/.gitignore index f1af3e5..e47984c 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,5 @@ /subscription-manager-cockpit-1.21.2.tar.gz /subscription-manager-1.21.3.tar.gz /subscription-manager-cockpit-1.21.3.tar.gz +/subscription-manager-1.21.4.tar.gz +/subscription-manager-cockpit-1.21.4.tar.gz diff --git a/sources b/sources index a389463..89b4884 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.21.3.tar.gz) = c954e01c195d005e6c85b1d036198c55b901a75298dcdf08de4025bbe4b292ff73dc220f935bd77c538c5f8db724fc8b67c8956a3db7015b2251b66061f9a862 -SHA512 (subscription-manager-cockpit-1.21.3.tar.gz) = 728b2cbfc3f488a011c45a721268098a264482449553b715f7adbe75135b6a34f8d5b003f119a229e7f71baf86ea7a1438d04de836444a04bc1c8c73bc6d837d +SHA512 (subscription-manager-1.21.4.tar.gz) = 708cc3dcbedabea43e6d3a93f608f88dedb0b9961e01c11cec619b4207ebefcc52f861e69c1f7def061deb26483585214172f3380d72308bba32f8f9b30ac275 +SHA512 (subscription-manager-cockpit-1.21.4.tar.gz) = 563a612b9b5aa2fc9605611ecfede790791fde9e60a7783ec4f855e1857ff17ed103580e61d736cb4965d3df1a38ed0374d01fa977626d5c1dd45a17299b10b4 diff --git a/subscription-manager.spec b/subscription-manager.spec index 5b1c745..b31c756 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -26,6 +26,11 @@ %bcond_without python2_rhsm %endif +%if %{with python3} +%global use_subman_gui 0 +%else +%global use_subman_gui 1 +%endif %global rhsm_plugins_dir /usr/share/rhsm-plugins # on recent Fedora and RHEL 7, let's not use m2crypto @@ -43,6 +48,12 @@ %global use_inotify 0 %endif +%if %{use_subman_gui} || %{use_initial_setup} || %{use_firstboot} +%global use_rhsm_gtk 1 +%else +%global use_rhsm_gtk 0 +%endif + %global use_dnf %{with python3} && (0%{?fedora} || (0%{?rhel})) %global use_yum (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?suse_version}) %global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7 @@ -106,10 +117,16 @@ %define with_systemd WITH_SYSTEMD=false %endif +%if %{use_subman_gui} +%define with_subman_gui WITH_SUBMAN_GUI=true +%else +%define with_subman_gui WITH_SUBMAN_GUI=false +%endif + %define subpackages SUBPACKAGES="%{?include_intentctl:intentctl}" Name: subscription-manager -Version: 1.21.3 +Version: 1.21.4 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -206,9 +223,12 @@ BuildRequires: %{py_package_prefix}-setuptools BuildRequires: gettext BuildRequires: intltool BuildRequires: libnotify-devel -BuildRequires: desktop-file-utils BuildRequires: %{py_package_prefix}-six +%if %use_subman_gui +BuildRequires: desktop-file-utils +%endif + BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel} BuildRequires: %{?suse_version:lsb-release, distribution-release} %{!?suse_version:redhat-lsb} BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel} @@ -255,15 +275,15 @@ Enables handling of content of type 'containerImage' in any certificates from the server. Populates /etc/docker/certs.d appropriately. -%package -n subscription-manager-gui -Summary: A GUI interface to manage Red Hat product subscriptions +%if %{use_rhsm_gtk} +%package -n rhsm-gtk +Summary: GTK+ widgets used by subscription-manager-gui and initial_setup Group: System Environment/Base -Requires: %{name} = %{version}-%{release} - -# We need pygtk3 and gtk2 until rhsm-icon is ported to gtk3 Requires: %{?gtk3:pygobject3, gtk3} %{!?gtk3:pygtk2, pygtk2-libglade} Requires: usermode-gtk -Requires: gnome-icon-theme +# Fedora can figure this out automatically, but RHEL cannot: +# See #987071 +Requires: librsvg2%{?_isa} %if 0%{?gtk3} Requires: font(cantarell) @@ -276,18 +296,31 @@ Requires(post): scrollkeeper Requires(postun): scrollkeeper %endif +%description -n rhsm-gtk +This package contains GUI and widgets used by subscription-manager-gui +and RHSM initial_setup module for Anaconda. +%endif + + +%if %{use_subman_gui} +%package -n subscription-manager-gui +Summary: A GUI interface to manage Red Hat product subscriptions +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} +Requires: gnome-icon-theme + +# We need pygtk3 and gtk2 until rhsm-icon is ported to gtk3 +Requires: rhsm-gtk = %{version}-%{release} + # Renamed from -gnome, so obsolete it properly Obsoletes: %{name}-gnome < 1.0.3-1 Provides: %{name}-gnome = %{version}-%{release} -# Fedora can figure this out automatically, but RHEL cannot: -# See #987071 -Requires: librsvg2%{?_isa} - %description -n subscription-manager-gui This package contains a GTK+ graphical interface for configuring and registering a system with a Red Hat Entitlement platform and manage subscriptions. +%endif %package -n subscription-manager-migration @@ -330,7 +363,7 @@ product-id plugins. %package -n subscription-manager-firstboot Summary: Firstboot screens for subscription manager Group: System Environment/Base -Requires: %{name}-gui = %{version}-%{release} +Requires: rhsm-gtk = %{version}-%{release} Requires: rhn-setup-gnome # Fedora can figure this out automatically, but RHEL cannot: @@ -345,7 +378,7 @@ This package contains the firstboot screens for subscription-manager. %package -n subscription-manager-initial-setup-addon Summary: initial-setup screens for subscription-manager Group: System Environment/Base -Requires: %{name}-gui = %{version}-%{release} +Requires: rhsm-gtk = %{version}-%{release} Requires: initial-setup-gui >= 0.3.9.24-1 Obsoletes: subscription-manager-firstboot < 1.15.3-1 @@ -472,6 +505,7 @@ make -f Makefile install VERSION=%{version}-%{release} \ %{?install_yum_plugins} %{?install_dnf_plugins} \ %{?install_zypper_plugins} \ %{?with_systemd} \ + %{?with_subman_gui} \ %{?subpackages} \ %{?include_intentctl:INCLUDE_INTENTCTL="1"} @@ -484,11 +518,16 @@ cp -r %{buildroot}%{python_sitearch}/rhsm %{buildroot}%{python2_sitearch}/rhsm %suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager %endif +%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 +%endif %find_lang rhsm -%find_lang %{name} --with-gnome + +#%if %{use_subman_gui} +#%find_lang %{name} --with-gnome +#%endif # fix timestamps on our byte compiled files so they match across arches find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; @@ -614,9 +653,12 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %{_sysconfdir}/bash_completion.d/rct %{_sysconfdir}/bash_completion.d/rhsm-debug %{_sysconfdir}/bash_completion.d/rhn-migrate-classic-to-rhsm -%{_sysconfdir}/bash_completion.d/rhsm-icon %{_sysconfdir}/bash_completion.d/rhsmcertd +%if %use_subman_gui +%{_sysconfdir}/bash_completion.d/rhsm-icon +%endif + %dir %{python_sitearch}/subscription_manager # code, python modules and packages @@ -728,7 +770,23 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %doc LICENSE -%files -n subscription-manager-gui -f subscription-manager.lang +%if %{use_rhsm_gtk} +%files -n rhsm-gtk +%defattr(-,root,root,-) +%dir %{python_sitearch}/subscription_manager/gui +%{python_sitearch}/subscription_manager/gui/*.py* +%{python_sitearch}/subscription_manager/gui/data/ui/*.ui +%{python_sitearch}/subscription_manager/gui/data/glade/*.glade +%{python_sitearch}/subscription_manager/gui/data/icons/*.svg +%if %{with python3} +%{python_sitearch}/subscription_manager/gui/__pycache__ +%endif +%endif + + +%if %{use_subman_gui} +#%files -n subscription-manager-gui -f subscription-manager.lang +%files -n subscription-manager-gui %defattr(-,root,root,-) %attr(755,root,root) %{_sbindir}/subscription-manager-gui %if 0%{?suse_version} @@ -739,21 +797,20 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %dir %{_datadir}/appdata %dir %{_datadir}/gnome %dir %{_datadir}/gnome/help +%dir %{_datadir}/gnome/help/subscription-manager +%dir %{_datadir}/gnome/help/subscription-manager/C +%dir %{_datadir}/gnome/help/subscription-manager/C/figures %dir %{_datadir}/omf +%dir %{_datadir}/omf/subscription-manager %else # symlink to console-helper %{_bindir}/subscription-manager-gui %endif %{_bindir}/rhsm-icon -%dir %{python_sitearch}/subscription_manager/gui -%{python_sitearch}/subscription_manager/gui/*.py* -%{python_sitearch}/subscription_manager/gui/data/ui/*.ui -%{python_sitearch}/subscription_manager/gui/data/glade/*.glade -%{python_sitearch}/subscription_manager/gui/data/icons/*.svg -%if %{with python3} -%{python_sitearch}/subscription_manager/gui/__pycache__ -%endif +%{_datadir}/gnome/help/subscription-manager/C/figures/*.png +%{_datadir}/gnome/help/subscription-manager/C/*.xml +%{_datadir}/omf/subscription-manager/subscription-manager-C.omf %{_datadir}/applications/subscription-manager-gui.desktop %{_datadir}/icons/hicolor/16x16/apps/*.png @@ -766,18 +823,42 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/appdata/subscription-manager-gui.appdata.xml -# gui system config files +# desktop config files %{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %if !0%{?suse_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui %endif + %{_sysconfdir}/bash_completion.d/subscription-manager-gui %doc %{_mandir}/man8/subscription-manager-gui.8* %{_mandir}/man8/rhsm-icon.8* %doc LICENSE +%endif + + +%if %use_initial_setup + +%files -n subscription-manager-initial-setup-addon +%defattr(-,root,root,-) +%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ +%{_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* +%if %{with python3} +%{_datadir}/anaconda/addons/com_redhat_subscription_manager/__pycache__ +%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/__pycache__ +%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/__pycache__ +%{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/__pycache__ +%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/__pycache__ +%endif + +%endif %files -n subscription-manager-migration @@ -841,26 +922,6 @@ install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/ca/redhat-uep.pem %{buildroo %endif -%if %use_initial_setup -%files -n subscription-manager-initial-setup-addon -%defattr(-,root,root,-) -%dir %{_datadir}/anaconda/addons/com_redhat_subscription_manager/ -%{_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* -%if %{with python3} -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/gui/spokes/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/categories/__pycache__ -%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ks/__pycache__ -%endif -%endif - - %if %use_firstboot %files -n subscription-manager-firstboot %defattr(-,root,root,-) @@ -937,11 +998,13 @@ if [ "$1" -eq "2" ] ; then fi %endif +%if %{use_subman_gui} %post -n subscription-manager-gui touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %if !0%{?suse_version} scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : %endif +%endif %post -n subscription-manager-plugin-container %{__python} %{rhsm_plugins_dir}/container_content.py || : @@ -969,6 +1032,7 @@ fi %endif %endif +%if %{use_subman_gui} %postun -n subscription-manager-gui if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -977,12 +1041,17 @@ if [ $1 -eq 0 ] ; then scrollkeeper-update -q || : %endif fi - %posttrans -n subscription-manager-gui touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : +%endif %changelog +* Tue May 01 2018 Christopher Snyder 1.21.4-1 +- Stop building subscription-manager-gui, when Python 3 is used + (jhnidek@redhat.com) +- Remove kitchen from install_requires (khowell@redhat.com) + * Wed Apr 25 2018 Christopher Snyder 1.21.3-1 - 1439645: Perform a full entitlement refresh in the yum/dnf/zypper plugins (csnyder@redhat.com)