Update subscription-manager to 1.15.1-1

Resolves: #1228807 - Make disabling proxy via gui apply (alikins@redhat.com)
Resolves: #1224806 - Prevent yum blocking on rhsm locks (alikins@redhat.com)
Resolves: #1092564 - Add LDFLAGS to makefile so RPM can modify them. (awood@redhat.com)
Resolves: #1225435 - Use LC_ALL instead of LANG for lscpu. (alikins@redhat.com)
Resolves: #1189953 - Replaced usage of "startup" with "start-up" (crog@redhat.com)
Resolves: #1194453 - Fixed typos and grammar issues in the rhsmcertd man page
Resolves: #1192646 - Fixed typos and grammar issues in the RHSM conf man page
Resolves: #1192574 - Fixed typos and grammar issues in subman GUI man page
Resolves: #1192120 - Fixed typos and grammar issues in subman man page (crog@redhat.com)
Resolves: #1192094 - Fixed erroneous usage of "servicelevel" for the subman command
Resolves: #1194468 - Fixed typos and grammar in rhsm-debug man page (crog@redhat.com)
Resolves: #1193991 - Fixed typos and header for RCT man page. (crog@redhat.com)
Resolves: #1200507 - Hyphenated uses of the non-word "plugin." (crog@redhat.com)
Resolves: #1189946 - Removed extraneous hyphens from instances of "pre-configure"
Resolves: #1189937 - Added hypens to instances of the non-word "wildcard"
Resolves: #1149098 - Removed uses of the non-word "unregister" (crog@redhat.com)
Resolves: #1189880 - Removed the non-word "unentitle" from error messages
Resolves: #1223038 - Fix API used by openshift clients. (alikins@redhat.com)
Resolves: #1195824 - Latest strings from zanata (alikins@redhat.com)
Resolves: #1223860 - Revert to default value on remove command (wpoteat@redhat.com)
Resolves: #1223852 - fix 'Deletedfd' string in repo report (alikins@redhat.com)
Resolves: #1220287 - Proxy Save accel fix with latest strings. (alikins@redhat.com)
Resolves: #1212515 - Print error message for missing systemid file. (awood@redhat.com)

.gitignore

@@ -52,3 +52,4 @@
 /subscription-manager-1.14.2.tar.gz
 /subscription-manager-1.14.3.tar.gz
 /subscription-manager-1.14.6.tar.gz
+/subscription-manager-1.15.1.tar.gz

sources

@@ -1 +1 @@
-3d92ced3412a35acdcff5492fc098f8c  subscription-manager-1.14.6.tar.gz
+8b5a72bf5e20b069c884a0e3b810bf79  subscription-manager-1.15.1.tar.gz

subscription-manager.spec

@@ -5,6 +5,7 @@
 %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 _hardened_build 1
@@ -21,7 +22,7 @@
 %endif
 
 Name: subscription-manager
-Version: 1.14.6
+Version: 1.15.1
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 Group:   System Environment/Base
@@ -38,13 +39,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  python-ethtool
 Requires:  python-iniparse
-Requires:  pygobject2
 Requires:  virt-what
-Requires:  python-rhsm >= 1.14.2
+Requires:  python-rhsm >= 1.15.0
 Requires:  dbus-python
 Requires:  yum >= 3.2.19-15
 Requires:  usermode
 Requires:  python-dateutil
+%if %use_gtk3
+Requires: gobject-introspection
+Requires: pygobject3-base
+%else
+Requires:  pygobject2
+%endif
 
 # There's no dmi to read on these arches, so don't pull in this dep.
 %ifnarch ppc ppc64 s390 s390x
@@ -65,11 +71,15 @@ BuildRequires: python-devel
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libnotify-devel
-BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: redhat-lsb
 BuildRequires: scrollkeeper
 BuildRequires: GConf2-devel
+%if %use_gtk3
+BuildRequires: gtk3-devel
+%else
+BuildRequires: gtk2-devel
+%endif
 %if %use_systemd
 # We need the systemd RPM macros
 BuildRequires: systemd
@@ -125,7 +135,14 @@ from the server. Populates /etc/docker/certs.d appropriately.
 Summary: A GUI interface to manage Red Hat product subscriptions
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
-Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas
+
+# We need pygtk3 and gtk2 until rhsm-icon is ported to gtk3
+%if %use_gtk3
+Requires: pygobject3
+Requires: gtk3
+%else
+Requires: pygtk2 pygtk2-libglade
+%endif
 Requires: usermode-gtk
 Requires: dbus-x11
 Requires: gnome-icon-theme
@@ -158,9 +175,8 @@ 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.
+This package contains the firstboot screens for subscription-manager.
 
 %package -n subscription-manager-migration
 Summary: Migration scripts for moving to certificate based subscriptions
@@ -182,7 +198,7 @@ subscriptions
 %setup -q
 
 %build
-make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}"
+make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
 
 %install
 rm -rf %{buildroot}
@@ -193,7 +209,9 @@ desktop-file-validate \
 
 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
 find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \;
@@ -233,26 +251,68 @@ 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,-)
 
-%attr(755,root,root) %dir %{_var}/log/rhsm
+# executables
-%attr(755,root,root) %dir %{_var}/spool/rhsm/debug
+%attr(755,root,root) %{_sbindir}/subscription-manager
+
+# symlink to console-helper
+%{_bindir}/subscription-manager
+%attr(755,root,root) %{_bindir}/rhsmcertd
+
+%attr(755,root,root) %{_libexecdir}/rhsmcertd-worker
+%attr(755,root,root) %{_libexecdir}/rhsmd
+
+# init scripts and systemd services
+%if %use_systemd
+    %attr(644,root,root) %{_unitdir}/rhsmcertd.service
+    %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf
+%else
+    %attr(755,root,root) %{_initrddir}/rhsmcertd
+%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(644,root,root) %config(noreplace) %{_sysconfdir}/rhsm/rhsm.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.SubscriptionManager.conf
 
-#remove the repo file when we are deleted
+# PAM config
+%{_sysconfdir}/pam.d/subscription-manager
+%{_sysconfdir}/security/console.apps/subscription-manager
+
+# remove the repo file when we are deleted
 %ghost %{_sysconfdir}/yum.repos.d/redhat.repo
 
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/rhsm/logging.conf
+# 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
+
+# misc system config
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager
+%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
+
+# bash completion scripts
 %{_sysconfdir}/bash_completion.d/subscription-manager
 %{_sysconfdir}/bash_completion.d/rct
 %{_sysconfdir}/bash_completion.d/rhsm-debug
@@ -260,79 +320,24 @@ rm -rf %{buildroot}
 %{_sysconfdir}/bash_completion.d/rhsm-icon
 %{_sysconfdir}/bash_completion.d/rhsmcertd
 
-%attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd
-%{_datadir}/dbus-1/system-services/com.redhat.SubscriptionManager.service
 
+# code
+# python package dirs
 %dir %{_datadir}/rhsm
 %dir %{_datadir}/rhsm/subscription_manager
 %dir %{_datadir}/rhsm/subscription_manager/branding
 %dir %{_datadir}/rhsm/subscription_manager/model
 %dir %{_datadir}/rhsm/subscription_manager/plugin
 
+# code, python modules and packages
 %{_datadir}/rhsm/subscription_manager/*.py*
 %{_datadir}/rhsm/subscription_manager/branding/*.py*
 %{_datadir}/rhsm/subscription_manager/model/*.py*
-%{_datadir}/rhsm/subscription_manager/async.py*
-%{_datadir}/rhsm/subscription_manager/base_action_client.py*
-%{_datadir}/rhsm/subscription_manager/base_plugin.py*
-%{_datadir}/rhsm/subscription_manager/branding
-%{_datadir}/rhsm/subscription_manager/cache.py*
-%{_datadir}/rhsm/subscription_manager/certdirectory.py*
-%{_datadir}/rhsm/subscription_manager/certlib.py*
-%{_datadir}/rhsm/subscription_manager/content_action_client.py*
-%{_datadir}/rhsm/subscription_manager/action_client.py*
-%{_datadir}/rhsm/subscription_manager/cert_sorter.py*
-%{_datadir}/rhsm/subscription_manager/cli.py*
-%{_datadir}/rhsm/subscription_manager/dbus_interface.py*
-
-%{_datadir}/rhsm/subscription_manager/dmiinfo.py*
-%{_datadir}/rhsm/subscription_manager/entcertlib.py*
-%{_datadir}/rhsm/subscription_manager/entbranding.py*
-%{_datadir}/rhsm/subscription_manager/cp_provider.py*
-%{_datadir}/rhsm/subscription_manager/factlib.py*
-%{_datadir}/rhsm/subscription_manager/facts.py*
-%{_datadir}/rhsm/subscription_manager/healinglib.py*
-%{_datadir}/rhsm/subscription_manager/hwprobe.py*
-%{_datadir}/rhsm/subscription_manager/isodate.py*
-%{_datadir}/rhsm/subscription_manager/i18n_optparse.py*
-%{_datadir}/rhsm/subscription_manager/i18n.py*
-%{_datadir}/rhsm/subscription_manager/identity.py*
-%{_datadir}/rhsm/subscription_manager/identitycertlib.py*
-%{_datadir}/rhsm/subscription_manager/injection.py*
-%{_datadir}/rhsm/subscription_manager/injectioninit.py*
-%{_datadir}/rhsm/subscription_manager/__init__.py*
-%{_datadir}/rhsm/subscription_manager/installedproductslib.py*
-%{_datadir}/rhsm/subscription_manager/jsonwrapper.py*
-%{_datadir}/rhsm/subscription_manager/listing.py*
-%{_datadir}/rhsm/subscription_manager/lock.py*
-%{_datadir}/rhsm/subscription_manager/logutil.py*
-%{_datadir}/rhsm/subscription_manager/managercli.py*
-%{_datadir}/rhsm/subscription_manager/managerlib.py*
-%{_datadir}/rhsm/subscription_manager/model
-%{_datadir}/rhsm/subscription_manager/model/*.py
-%{_datadir}/rhsm/subscription_manager/packageprofilelib.py*
-%{_datadir}/rhsm/subscription_manager/plugins.py*
-%{_datadir}/rhsm/subscription_manager/productid.py*
-%{_datadir}/rhsm/subscription_manager/reasons.py*
-%{_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*
-%{_datadir}/rhsm/subscription_manager/reasons.py*
-%{_datadir}/rhsm/subscription_manager/cp_provider.py*
-%{_datadir}/rhsm/subscription_manager/file_monitor.py*
-%{_datadir}/rhsm/subscription_manager/overrides.py*
-%{_datadir}/rhsm/subscription_manager/exceptions.py*
 %{_datadir}/rhsm/subscription_manager/plugin/*.py*
 
-%{_datadir}/rhsm/subscription_manager/version.py*
 # subscription-manager plugins
 %dir %{rhsm_plugins_dir}
 %dir %{_sysconfdir}/rhsm/pluginconf.d
-# add default plugins here when we have some
 
 # yum plugins
 # Using _prefix + lib here instead of libdir as that evaluates to /usr/lib64 on x86_64,
@@ -340,25 +345,6 @@ rm -rf %{buildroot}
 %{_prefix}/lib/yum-plugins/subscription-manager.py*
 %{_prefix}/lib/yum-plugins/product-id.py*
 
-%attr(755,root,root) %{_sbindir}/subscription-manager
-%attr(755,root,root) %{_bindir}/subscription-manager
-%attr(755,root,root) %{_bindir}/rhsmcertd
-%attr(755,root,root) %{_libexecdir}/rhsmcertd-worker
-%attr(755,root,root) %{_libexecdir}/rhsmd
-%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
-%{_sysconfdir}/pam.d/subscription-manager
-%{_sysconfdir}/security/console.apps/subscription-manager
-
-%if %use_systemd
-    %attr(644,root,root) %{_unitdir}/rhsmcertd.service
-    %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf
-%else
-    %attr(755,root,root) %{_initrddir}/rhsmcertd
-%endif
 
 # Incude rt CLI tool
 %dir %{_datadir}/rhsm/rct
@@ -385,12 +371,16 @@ rm -rf %{buildroot}
 %doc LICENSE
 
 
-%files -n subscription-manager-gui
+%files -n subscription-manager-gui -f subscription-manager.lang
 %defattr(-,root,root,-)
+%attr(755,root,root) %{_sbindir}/subscription-manager-gui
+# symlink to console-helper
+%{_bindir}/subscription-manager-gui
+%{_bindir}/rhsm-icon
 %dir %{_datadir}/rhsm/subscription_manager/gui
 %dir %{_datadir}/rhsm/subscription_manager/gui/data
 %dir %{_datadir}/rhsm/subscription_manager/gui/data/icons
-%{_datadir}/rhsm/subscription_manager/gui/*
+%{_datadir}/rhsm/subscription_manager/gui/data/*.glade
 %{_datadir}/rhsm/subscription_manager/gui/data/icons/*.svg
 %{_datadir}/applications/subscription-manager-gui.desktop
 %{_datadir}/icons/hicolor/16x16/apps/*.png
@@ -401,13 +391,13 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/96x96/apps/*.png
 %{_datadir}/icons/hicolor/256x256/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
-%attr(755,root,root) %{_sbindir}/subscription-manager-gui
-%attr(755,root,root) %{_bindir}/subscription-manager-gui
 %{_datadir}/appdata/subscription-manager-gui.appdata.xml
 
-%{_bindir}/rhsm-icon
+# code and modules
-%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop
+%{_datadir}/rhsm/subscription_manager/gui/*.py*
 
+# gui system config files
+%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop
 %{_sysconfdir}/pam.d/subscription-manager-gui
 %{_sysconfdir}/security/console.apps/subscription-manager-gui
 %{_sysconfdir}/bash_completion.d/subscription-manager-gui
@@ -415,11 +405,6 @@ rm -rf %{buildroot}
 %doc
 %{_mandir}/man8/subscription-manager-gui.8*
 %{_mandir}/man8/rhsm-icon.8*
-%{_datadir}/omf/subscription-manager
-%attr(644,root,root) %{_datadir}/omf/subscription-manager/*.omf
-%{_datadir}/gnome/help/subscription-manager
-%attr(644,root,root) %{_datadir}/gnome/help/subscription-manager/C/*
-%attr(755,root,root) %{_datadir}/gnome/help/subscription-manager/C/figures
 %doc LICENSE
 
 %files -n subscription-manager-firstboot
@@ -431,7 +416,6 @@ rm -rf %{buildroot}
 %{_datadir}/firstboot/modules/rhsm_login.py*
 %endif
 
-
 %files -n subscription-manager-migration
 %defattr(-,root,root,-)
 %dir %{_datadir}/rhsm/subscription_manager/migrate
@@ -485,6 +469,69 @@ fi
 %endif
 
 %changelog
+* 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)
+- 1228807: Make disabling proxy via gui apply (alikins@redhat.com)
+- Use find_lang --with-gnome for the gnome help (alikins@redhat.com)
+- Cast return daemon() to void to quiet warnings. (alikins@redhat.com)
+- Make the 'compile-po' step in the build quiet. (alikins@redhat.com)
+- Make desktop-file-validate warnings. (alikins@redhat.com)
+- rpm spec file reorg (alikins@redhat.com)
+- 1224806: Prevent yum blocking on rhsm locks (alikins@redhat.com)
+- 1092564: Add LDFLAGS to makefile so RPM can modify them. (awood@redhat.com)
+- Update registergui.py (wpoteat@redhat.com)
+- Bump version to 1.15 (wpoteat@redhat.com)
+- Remove spurious debug logging about content labels (alikins@redhat.com)
+- Revert "1189953: Replaced usage of "startup" with "start-up""
+  (crog@redhat.com)
+- Revert "1149098: Removed uses of the non-word "unregister"" (crog@redhat.com)
+- Revert "1189937: Added hypens to instances of the non-word "wildcard""
+  (crog@redhat.com)
+- Revert "1200507: Hyphenated uses of the non-word "plugin."" (crog@redhat.com)
+- 1225435: Use LC_ALL instead of LANG for lscpu. (alikins@redhat.com)
+- Remove mutable default args in stubs (alikins@redhat.com)
+- Add notes about how register/firstboot interact. (alikins@redhat.com)
+- 1189953: Replaced usage of "startup" with "start-up" (crog@redhat.com)
+- 1194453: Fixed typos and grammar issues in the rhsmcertd man page
+  (crog@redhat.com)
+- 1192646: Fixed typos and grammar issues in the RHSM conf man page
+  (crog@redhat.com)
+- 1192574: Fixed typos and grammar issues in subman GUI man page
+  (crog@redhat.com)
+- 1192120: Fixed typos and grammar issues in subman man page (crog@redhat.com)
+- 1192094: Fixed erroneous usage of "servicelevel" for the subman command
+  (crog@redhat.com)
+- 1194468: Fixed typos and grammar in rhsm-debug man page (crog@redhat.com)
+- 1193991: Fixed typos and header for RCT man page. (crog@redhat.com)
+- 1200507: Hyphenated uses of the non-word "plugin." (crog@redhat.com)
+- 1189946: Removed extraneous hyphens from instances of "pre-configure"
+  (crog@redhat.com)
+- 1189937: Added hypens to instances of the non-word "wildcard"
+  (crog@redhat.com)
+- 1149098: Removed uses of the non-word "unregister" (crog@redhat.com)
+- 1189880: Removed the non-word "unentitle" from error messages
+  (crog@redhat.com)
+
+* Tue Jun 02 2015 William Poteat <wpoteat@redhat.com> 1.14.9-1
+- 1223038: Fix API used by openshift clients. (alikins@redhat.com)
+- 1195824: Latest strings from zanata (alikins@redhat.com)
+
+* Tue May 26 2015 William Poteat <wpoteat@redhat.com> 1.14.8-1
+- 1223860: Revert to default value on remove command (wpoteat@redhat.com)
+- translation sync from zanata (alikins@redhat.com)
+- 1223852: fix 'Deletedfd' string in repo report (alikins@redhat.com)
+- Remove gnome-python2-canvas,gnome-python2 deps (alikins@redhat.com)
+
+* Tue May 19 2015 William Poteat <wpoteat@redhat.com> 1.14.7-1
+- 1220287: Proxy Save accel fix with latest strings. (alikins@redhat.com)
+- 1212515: Print error message for missing systemid file. (awood@redhat.com)
+- Added missing option to the migration manual page (crog@redhat.com)
+- Specified error codes on system_exit in rhn-migrate-classic-to-rhsm
+  (crog@redhat.com)
+- Updated the manual pages for the attach command (crog@redhat.com)
+- Remove locale based DatePicker tests. (alikins@redhat.com)
+- Make rhsm-debug test cases clean up better. (alikins@redhat.com)
+
 * Fri May 01 2015 William Poteat <wpoteat@redhat.com> 1.14.6-1
 - 1149095: Fix error when yum updates subman modules (alikins@redhat.com)
 - 1159163: Fix prod id del because of --disablerepo (alikins@redhat.com)