From 92d9508940db0eb2ef19059af3e48566f48cd1c6 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 28 Jun 2012 15:22:03 -0300 Subject: [PATCH] Update subscription-manager to 1.0.7-1 --- .gitignore | 1 + sources | 2 +- subscription-manager.spec | 220 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 211 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 846b7aa..9c5721b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /subscription-manager-0.99.13.tar.gz /subscription-manager-1.0.2.tar.gz /subscription-manager-1.0.3.tar.gz +/subscription-manager-1.0.7.tar.gz diff --git a/sources b/sources index 93fb79c..4a11386 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cb12ea370aeca37740c2df842fdb12b subscription-manager-1.0.3.tar.gz +936418d02b14c269ea0ad672d6356795 subscription-manager-1.0.7.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index c0bed08..cb642a7 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -1,5 +1,7 @@ # Skip rhsm-icon on Fedora 15+ and RHEL 7+ %define use_rhsm_icon (0%{?fedora} && 0%{?fedora} < 15) || (0%{?rhel} && 0%{?rhel} < 7) +# Prefer systemd over sysv on Fedora 17+ and RHEL 7+ +%define use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7) # A couple files are for RHEL 5 only: %if 0%{?rhel} == 5 @@ -7,7 +9,7 @@ %endif Name: subscription-manager -Version: 1.0.3 +Version: 1.0.7 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -40,6 +42,12 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts +%if %use_systemd +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +%endif + BuildRequires: python-devel BuildRequires: gettext BuildRequires: intltool @@ -205,7 +213,6 @@ rm -rf %{buildroot} %attr(755,root,root) %{_sbindir}/subscription-manager %attr(755,root,root) %{_bindir}/subscription-manager %attr(755,root,root) %{_bindir}/rhsmcertd -%attr(755,root,root) %{_initrddir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker %attr(755,root,root) %{_libexecdir}/rhsmd %attr(755,root,root) %dir %{_var}/run/rhsm @@ -216,6 +223,12 @@ rm -rf %{buildroot} %{_sysconfdir}/pam.d/subscription-manager %{_sysconfdir}/security/console.apps/subscription-manager +%if %use_systemd + %attr(644,root,root) %{_unitdir}/rhsmcertd.service +%else + %attr(755,root,root) %{_initrddir}/rhsmcertd +%endif + %doc %{_mandir}/man8/subscription-manager.8* %{_mandir}/man8/rhsmcertd.8* @@ -285,24 +298,209 @@ rm -rf %{buildroot} %endif %post -chkconfig --add rhsmcertd +%if %use_systemd + /bin/systemctl enable rhsmcertd.service >/dev/null 2>&1 || : + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart rhsmcertd.service >/dev/null 2>&1 || : +%else + chkconfig --add rhsmcertd +%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 || : fi -if [ "$1" -eq "2" ] ; then - /sbin/service rhsmcertd condrestart >/dev/null 2>&1 || : -fi + +%if !%use_systemd + if [ "$1" -eq "2" ] ; then + /sbin/service rhsmcertd condrestart >/dev/null 2>&1 || : + fi +%endif %preun if [ $1 -eq 0 ] ; then - /sbin/service rhsmcertd stop >/dev/null 2>&1 - /sbin/chkconfig --del rhsmcertd - if [ -x /bin/dbus-send ] ; then - dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || : - fi + %if %use_systemd + /bin/systemctl --no-reload disable rhsmcertd.service > /dev/null 2>&1 || : + /bin/systemctl stop rhsmcertd.service > /dev/null 2>&1 || : + %else + /sbin/service rhsmcertd stop >/dev/null 2>&1 + /sbin/chkconfig --del rhsmcertd + %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 || : + fi fi +%postun +%if %use_systemd + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + if [ $1 -eq 1 ] ; then + /bin/systemctl try-restart rhsmcertd.service >/dev/null 2>&1 || : + fi +%endif + %changelog +* Thu Jun 28 2012 Alex Wood 1.0.7-1 +- Revamp choose server screen. (dgoodwin@redhat.com) + +* Thu Jun 28 2012 Alex Wood 1.0.6-1 +- rhsmcertd no longer exits when not registered. (mstead@redhat.com) +- po file cleanups (alikins@redhat.com) +- latest strings from zanata (alikins@redhat.com) +- Free config resources in one place (mstead@redhat.com) +- rhsmcertd: free GKeyFile when done (jbowes@redhat.com) +- rhsmcertd: remove studlyCaps (jbowes@redhat.com) +- "make stylish" should failed on "swapped" in glade files (alikins@redhat.com) +- Remove 'swapped=on' from glade signal markup. (alikins@redhat.com) +- add 'fix-glade-swapped' target to de-'swapped' glade files + (alikins@redhat.com) +- make stylish fixups (alikins@redhat.com) +- Fix at-spi label for "offline_radio" widget (alikins@redhat.com) +- shorter messages for cases where registered to RHN Classic + (alikins@redhat.com) +- Tighten up the gettext_lint regex (alikins@redhat.com) +- Fix string that was breaking xgettext (alikins@redhat.com) +- 810998: Add a button to test a proxy connection. (awood@redhat.com) +- new messages, and remove checking of rhn serverURL (alikins@redhat.com) +- remove unused es.po file (bkearney@redhat.com) +- 829486: Removed untranslated words to force a re-translation + (bkearney@redhat.com) +- Remove unused bn.po file (bkearney@redhat.com) +- 826856: Add check for service-level command that --org can only be used with + --list option (bkearney@redhat.com) +- 829483: Remove english to english translation to force a re-translations + (bkearney@redhat.com) +- Remove unused de po file (bkearney@redhat.com) +- 819665: on 'version' display if we are registered to RHN Classic + (alikins@redhat.com) + +* Tue Jun 26 2012 Alex Wood 1.0.5-1 +- 804109: Give a specific message when providing invalid credentials. + (awood@redhat.com) +- 810360: update wording in gnome help file (cduryee@redhat.com) +- use new bin location of files for $STYLEFILES (alikins@redhat.com) +- add 'debuglint' for checking for leftover debugger imports + (alikins@redhat.com) +- Update make clean target (jbowes@redhat.com) +- Move py executables to bin/ (jbowes@redhat.com) +- Put no results text inside the scrolled window (jbowes@redhat.com) +- 817901: Show text when there are no subscriptions to show. + (dgoodwin@redhat.com) +- Move initd file to etc-conf (jbowes@redhat.com) +- Move plugins to their own src dir (jbowes@repl.ca) +- More test cases for utils.parse_url (alikins@redhat.com) +- 829482: Delete unstranslated strings in order force a retranslation + (bkearney@redhat.com) +- 811602: Fix the help output based on UXD feedback (bkearney@redhat.com) +- 828867: Removed the extra %%s string from the te translation + (bkearney@redhat.com) +- 829479: Remove unstranslated strings to force a re-translation + (bkearney@redhat.com) +- Delete the unused pt.po file (bkearney@redhat.com) +- 829476: Remove untranslated strings. (bkearney@redhat.com) +- 811553: Improve the text for auto subscribe during registration + (bkearney@redhat.com) +- 829471: Fix the translation for usage, and remove a translation for %%org id + to force a retranslation (bkearney@redhat.com) +- Remove an outdated ta.po file (bkearney@redhat.com) +- 828810: Remove extra %%s in translation (bkearney@redhat.com) +- Test to ensure that pool id is in the output for list --available + (wpoteat@redhat.com) +- Close registration window even if it failed. (dgoodwin@redhat.com) +- 825923: Subscription-manager service-level set should say "Service level set + to:" (wpoteat@redhat.com) +- 811594: Default behavior for ReposCommand is --list (wpoteat@redhat.com) +- 832400: service-level --unset should display proper message for unregistered + client. (wpoteat@redhat.com) + +* Tue Jun 19 2012 Alex Wood 1.0.4-1 +- 818978: Use systemd instead of sysv when installing on F17+ and RHEL7+. + (mstead@redhat.com) +- 827035: update identity certificate (jmrodri@gmail.com) +- registergui: make screens without guis more generic (jbowes@redhat.com) +- Incorrect field value removed on previous change (wpoteat@redhat.com) +- 829812: Add an unset command for the release command (bkearney@redhat.com) +- 823659: Update SLA text in Settings to Service Level (wpoteat@redhat.com) +- Use a temp file for finding used widgets (jbowes@redhat.com) +- clean up some unused import warnings (jbowes@redhat.com) +- default to running style checks on tests (jbowes@redhat.com) +- Make test cases stylish as well... (alikins@redhat.com) +- Fix "make stylish" (alikins@redhat.com) +- 829803: Added an unset command to service level. (bkearney@redhat.com) +- Remove reference to InstalledProductsTab.product_id_text (alikins@redhat.com) +- Add a "find-missing-widgets" target to makefile (alikins@redhat.com) +- 830949: add accessibility locators for registration widgets + (alikins@redhat.com) +- 824979: No message for subscription-manager release --list with no + subscriptions. (wpoteat@redhat.com) +- Added UnRegisterCommand and UnSubscribeCommand nosetests (wpoteat@redhat.com) +- registergui: get firstboot working with new new code (jbowes@repl.ca) +- registergui: Create a PreformRegisterScreen class (jbowes@repl.ca) +- registergui: add a post method for setting data on the parent + (jbowes@repl.ca) +- registergui: create a 'pre' hook for screens (jbowes@repl.ca) + (cduryee@redhat.com) +- 819665: print msg if user is registered to RHN Classic on "identity" command + (cduryee@redhat.com) + (wpoteat@redhat.com) +- Add F17 yum repo release target. (dgoodwin@redhat.com) +- fix make stylish (jbowes@redhat.com) +- 810352: Disable the expansion of the system name selection in the register + dialog (bkearney@redhat.com) +- 824530: add test case for setting proxy cli for release (alikins@redhat.com) +- rhsm-icon codestyle cleanups (jbowes@repl.ca) +- 829900: Use the term 'Subscription Management Service' to refer to SAM, CFSE, + etc (root@bkearney.(none)) +- 829898: Make the no service level option a bit clearer as to its meaning + (bkearney@redhat.com) +- Improve the logging so that the user only sees the approved output by default + (bkearney@redhat.com) +- 830193: Modify the output of the yum plugin to be consistent with RHN + (bkearney@redhat.com) +- 824530: "release" command ignoring cli proxy options (alikins@redhat.com) +- 828042,828068: Make ja_JP's Confirm Subscription unique for firstboot. + (mstead@redhat.com) +- Updating strings from zanata (mstead@redhat.com) +- 825309: Remove the archiecture field from the table. (bkearney@redhat.com) +- 823608: Rename the software pane to product (bkearney@redhat.com) +- 810369: Prefer the term Subscription to Entitlement (bkearney@redhat.com) +- Add a warning comment about firstboot module titles (alikins@redhat.com) +- Clean up an option (bkearney@redhat.com) +- 827208: Fix the xmltag bugs in the or po file (bkearney@redhat.com) +- 827214: Clean up the XML tags in ta po file. (bkearney@redhat.com) +- Slight change in the path for the ta po file (bkearney@redhat.com) +- Slight change in the path for the ta po file (bkearney@redhat.com) +- Slight change in the path for the ml po file (bkearney@redhat.com) +- 828583: Add some spacing at the end of the file paths in the ko.po file + (bkearney@redhat.com) +- 828816: the %%prog variable should not be translated (bkearney@redhat.com) +- 828821: Fix the addition of a new variable in the hi po file + (bkearney@redhat.com) +- 828903: Fix translation of options in the bn po file. (bkearney@redhat.com) +- Fix part of the mis translated options (bkearney@redhat.com) +- 828965: Fix a translated option which should not have been translated + (bkearney@redhat.com) +- 828954: fix the --pool option in the translated string (bkearney@redhat.com) +- 828958: --available should not be translated (bkearney@redhat.com) +- Add --password as an option, not a string. This cause several strings to be + retranslated (bkearney@redhat.com) +- 828969: Fix the options in the translated string (bkearney@redhat.com) +- 828985: Fix the url in the translated string (bkearney@redhat.com) +- 828989: Fix the access url (bkearney@redhat.com) +- 818205: Release --set command should only accept values from --list. + (awood@redhat.com) +- registergui: extract out a screen superclass (jbowes@repl.ca) +- registergui: get button label from screen class (jbowes@repl.ca) +- registergui: keep screens in a list (jbowes@repl.ca) +- registergui: pull out environment screen into its own class (jbowes@repl.ca) +- registergui: sensitivity refactor and method move (jbowes@repl.ca) +- registergui: extract out credentials_entered method (jbowes@repl.ca) +- registergui: move organization screen to its own class (jbowes@repl.ca) +- registergui: move credentials screen to its own class (jbowes@repl.ca) +- registergui: move choose server screen to its own class (jbowes@repl.ca) +- registergui: switch from GladeWrapper to GladeWidget (jbowes@repl.ca) +- registergui: Remove some unused globals (jbowes@repl.ca) + * Thu Jun 07 2012 Alex Wood 1.0.3-1 - 817938: Add sorting to the contract selection table. (awood@redhat.com) - 822706: gtk widget visibility toggle compat for el5 (jbowes@repl.ca)