From 2368bcab68cb03fd513ba0c872d373e3249ea903 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 7 Jun 2012 15:52:39 -0300 Subject: [PATCH] Update subscription-manager to 1.0.3-1 --- .gitignore | 1 + sources | 2 +- subscription-manager.spec | 87 ++++++++++++++++++++++++++++++++++----- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 587dff5..846b7aa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /subscription-manager-0.99.10.tar.gz /subscription-manager-0.99.13.tar.gz /subscription-manager-1.0.2.tar.gz +/subscription-manager-1.0.3.tar.gz diff --git a/sources b/sources index f0c5a39..93fb79c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99552106a13edf007279dadd9dc02f0d subscription-manager-1.0.2.tar.gz +5cb12ea370aeca37740c2df842fdb12b subscription-manager-1.0.3.tar.gz diff --git a/subscription-manager.spec b/subscription-manager.spec index 4ce66a7..c0bed08 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -7,7 +7,7 @@ %endif Name: subscription-manager -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -17,7 +17,7 @@ License: GPLv2 # # git clone git://git.fedorahosted.org/git/subscription-manager.git/ # yum install tito -# tito build --tag subscription-manager-%{version}-%{release} --tgz +# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz Source0: %{name}-%{version}.tar.gz URL: https://fedorahosted.org/subscription-manager/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,7 +57,7 @@ to manage subscriptions and yum repositories from the Red Hat entitlement platform. -%package -n subscription-manager-gnome +%package -n subscription-manager-gui Summary: A GUI interface to manage Red Hat product subscriptions Group: System Environment/Base Requires: %{name} = %{version}-%{release} @@ -68,10 +68,14 @@ Requires: dbus-x11 Requires(post): scrollkeeper Requires(postun): scrollkeeper +# Renamed from -gnome, so obsolete it properly +Obsoletes: %{name}-gnome < %{version}-%{release} +Provides: %{name}-gnome = %{version}-%{release} + # Fedora can figure this out automatically, but RHEL cannot: Requires: librsvg2 -%description -n subscription-manager-gnome +%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. @@ -79,7 +83,7 @@ subscriptions. %package -n subscription-manager-firstboot Summary: Firstboot screens for subscription manager Group: System Environment/Base -Requires: %{name}-gnome = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} %{?el5:Requires: rhn-setup-gnome >= 0.4.20-49} %{?el6:Requires: rhn-setup-gnome >= 1.0.0-82} @@ -125,18 +129,18 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; mkdir %{buildroot}%{_sysconfdir}/yum.repos.d touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo -%post -n subscription-manager-gnome +%post -n subscription-manager-gui touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : -%postun -n subscription-manager-gnome +%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-gnome +%posttrans -n subscription-manager-gui gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %clean @@ -184,7 +188,6 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/cert_sorter.py* %{_datadir}/rhsm/subscription_manager/validity.py* %{_datadir}/rhsm/subscription_manager/hwprobe.py* -%{_datadir}/rhsm/subscription_manager/constants.py* %{_datadir}/rhsm/subscription_manager/lock.py* %{_datadir}/rhsm/subscription_manager/facts.py* %{_datadir}/rhsm/subscription_manager/factlib.py* @@ -219,7 +222,7 @@ rm -rf %{buildroot} %doc LICENSE -%files -n subscription-manager-gnome +%files -n subscription-manager-gui %defattr(-,root,root,-) %dir %{_datadir}/rhsm/subscription_manager/gui %dir %{_datadir}/rhsm/subscription_manager/gui/data @@ -300,6 +303,70 @@ if [ $1 -eq 0 ] ; then fi %changelog +* 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) +- 822706: Display Register button on Installed Product tab if not registered. + (mstead@redhat.com) +- 825286: Handle unset service levels in a manner similar to unset release + versions. (awood@redhat.com) +- 826735: Merge start/end date sub details into one row. (dgoodwin@redhat.com) +- fix make stylish (jbowes@repl.ca) +- 811593: Feedback when not providing command options is not consistent. + (wpoteat@redhat.com) +- 806986: Subscription-Manager should refer to subscription name and product + name. (wpoteat@redhat.com) +- 825737: Service-level --set should configure proper value for GUI + (wpoteat@redhat.com) +- 817901: Disable the match installed products filter. (dgoodwin@redhat.com) +- Remove unecessary use of lambda. (dgoodwin@redhat.com) +- 818282: Sort virtual subscriptions to the top of contract selector. + (dgoodwin@redhat.com) +- 818383: display better messages for yum plugin usage (cduryee@redhat.com) +- Fix logging of deleted expired certs (jbowes@repl.ca) +- Remove the constants module (jbowes@repl.ca) +- Remove useless format specifier (jbowes@repl.ca) +- 801187: condense list --consumed output (jbowes@repl.ca) +- Don't use kwargs for cli subclasses; it makes things shorter (jbowes@repl.ca) +- Remove desc cli argument, no module used it (jbowes@repl.ca) +- Use super for cli module init (jbowes@repl.ca) +- Clean up rpmlint messages (jbowes@repl.ca) +- Autogenerate the cli usage message (jbowes@repl.ca) +- Remove obsolete nose tests (jbowes@repl.ca) +- 812410: Show product name on CLI subscribe to pool. (dgoodwin@redhat.com) +- 824680: make init script status return proper exit code (alikins@redhat.com) +- fix nosetests for progress gui (jbowes@repl.ca) +- Rework urlparse calls to work with RHEL 5. (awood@redhat.com) +- 818238: Set a better progress title for sub search (jbowes@repl.ca) +- 771756: Drop "rhsm icon" from the rhsm-icon usage message (jbowes@repl.ca) +- 820294: Let candlepin handle org/env/key validation (jbowes@repl.ca) +- 818397: Rename subscription-manager-gnome to -gui (jbowes@repl.ca) +- Reduce wordiness of version command. (awood@redhat.com) +- 824333: use rhel5-friendly urlparse options (cduryee@redhat.com) +- Log the program versions when starting the GUI or making a CLI call. + (awood@redhat.com) +- Fix the About dialog to work in RHEL 5.8 (awood@redhat.com) +- 821544: Remove the stacking id attribute from my susbcriptions since it is + not being used currently. (bkearney@redhat.com) +- add checkcommits exception for 824100 (alikins@redhat.com) +- 824100: update zanata.xml to grab latest pt_BR.po (alikins@redhat.com) +- 822057: do not hard-code cdn to port 443 (cduryee@redhat.com) +- Display sane error on CLI if missing CA certificate. (dgoodwin@redhat.com) +- Display sane error in GUI if missing CA certificate. (dgoodwin@redhat.com) +- 812373: Terminology change for list --installed and --consumed + (wpoteat@redhat.com) +- zanata client will push any po/*.pot files it finds. Stop. + (alikins@redhat.com) +- 789182: Fix UnicodeEncodeError when logging. (awood@redhat.com) +- README for github and people who like to read (alikins@redhat.com) +- checkcommits exception for xgettext patch fixed in master + (alikins@redhat.com) +- 820743: Fix these strings so xgettext finds extracts them + (alikins@redhat.com) +- refine the regex for "make gettext_lint" (alikins@redhat.com) +- Upload el6 yum packages to another dir for compatability. + (dgoodwin@redhat.com) + * Wed May 16 2012 Devan Goodwin 1.0.2-1 - Updating strings from zanata (mstead@redhat.com) - Add new server setup GUI screen. (dgoodwin@redhat.com)