commit 1ad1c7d0f812e4c6690d5a24a22ac479d03178ec
Author: Devan Goodwin <dgoodwin@xxxxxxxxxx>
Date: Wed Feb 22 12:21:48 2012 -0400

Update subscription-manager to 0.99.8-1

.gitignore | 1 +
sources | 2 +-
subscription-manager.spec | 58 ++++++++++++++++++++++++++++++++++++++------
3 files changed, 52 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3a3980..0a56f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/subscription-manager-0.99.3.tar.gz
/subscription-manager-0.99.4.tar.gz
/subscription-manager-0.99.6.tar.gz
+/subscription-manager-0.99.8.tar.gz
diff --git a/sources b/sources
index 027d7eb..04fd72a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b575ed0cb443f626b3dda7e983480438 subscription-manager-0.99.6.tar.gz
+6fd5948b7d86c806167ad1a15bbbd4d7 subscription-manager-0.99.8.tar.gz
diff --git a/subscription-manager.spec b/subscription-manager.spec
index e6242b4..729654a 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -1,5 +1,8 @@
+# Skip rhsm-icon on Fedora 15+ and RHEL 7+
+%define use_rhsm_icon (0%{?fedora} && 0%{?fedora} < 15) || (0%{?rhel} &&
0%{?rhel} < 7)
+
Name: subscription-manager
-Version: 0.99.6
+Version: 0.99.8
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
@@ -93,10 +96,11 @@ make -f Makefile
rm -rf %{buildroot}
make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot}
MANPATH=%{_mandir}

-%if 0%{?fedora} < 15
+%if %use_rhsm_icon
desktop-file-validate \
%{buildroot}/etc/xdg/autostart/rhsm-icon.desktop
%endif
+
desktop-file-validate \
%{buildroot}/usr/share/applications/subscription-manager.desktop
%find_lang rhsm
@@ -140,7 +144,6 @@ rm -rf %{buildroot}

%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
-%config(noreplace) %attr(644,root,root)
%{_sysconfdir}/yum/pluginconf.d/katello.conf
%config(noreplace) %attr(644,root,root)
%{_sysconfdir}/logrotate.d/subscription-manager
%{_sysconfdir}/bash_completion.d/subscription-manager

@@ -162,7 +165,6 @@ rm -rf %{buildroot}
# but yum plugins seem to normally be sent to /usr/lib/:
%{_prefix}/lib/yum-plugins/subscription-manager.py*
%{_prefix}/lib/yum-plugins/product-id.py*
-%{_prefix}/lib/yum-plugins/katello.py*

%{_datadir}/rhsm/subscription_manager/certlib.py*
%{_datadir}/rhsm/subscription_manager/certdirectory.py*
@@ -178,12 +180,13 @@ rm -rf %{buildroot}
%{_datadir}/rhsm/subscription_manager/branding
%{_datadir}/rhsm/subscription_manager/quantity.py*
%{_datadir}/rhsm/subscription_manager/jsonwrapper.py*
+%{_datadir}/rhsm/subscription_manager/certmgr.py*

-%attr(755,root,root) %{_datadir}/rhsm/subscription_manager/certmgr.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) %{_initrddir}/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
@@ -210,7 +213,7 @@ rm -rf %{buildroot}
%attr(755,root,root) %{_sbindir}/subscription-manager-gui
%attr(755,root,root) %{_bindir}/subscription-manager-gui

-%if 0%{?fedora} < 15
+%if %use_rhsm_icon
%{_bindir}/rhsm-icon
%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop
%endif
@@ -243,11 +246,11 @@ rm -rf %{buildroot}
%files -n subscription-manager-migration
%defattr(-,root,root,-)
%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm
-%attr(755,root,root) %{_sbindir}/install-num-migrate-to-rhsm
+%{?el5:%attr(755,root,root) %{_sbindir}/install-num-migrate-to-rhsm}

%doc
%{_mandir}/man8/rhn-migrate-classic-to-rhsm.8*
-%{_mandir}/man8/install-num-migrate-to-rhsm.8*
+%{?el5:%{_mandir}/man8/install-num-migrate-to-rhsm.8*}
#only install this file on Fedora
%doc LICENSE
%if 0%{?fedora} > 14
@@ -273,6 +276,45 @@ if [ $1 -eq 0 ] ; then
fi

%changelog
+* Wed Feb 22 2012 Devan Goodwin <dgoodwin@xxxxxxxx> 0.99.8-1
+- 790205: do not lay down install-num-migrate-to-rhsm on rhel6 systems
+ (cduryee@xxxxxxxxxx)
+- latest translations from zanata (alikins@xxxxxxxxxx)
+- 795541: Change the environment filtering which is being done on the client
+ side (bkearney@xxxxxxxxxx)
+- Add consumer deleted on server detection. (jbowes@xxxxxxxxxx)
+- Fix spec for both Fedora 15+ and RHEL 7+. (dgoodwin@xxxxxxxxxx)
+- Fix Makefile for both Fedora 15+ and RHEL 7+. (dgoodwin@xxxxxxxxxx)
+- Add service level to register and subscribe CLI commands.
+ (dgoodwin@xxxxxxxxxx)
+- Add service-level CLI command. (dgoodwin@xxxxxxxxxx)
+- delete consumer on rhsmcertd checkin (jbowes@xxxxxxxxxx)
+- pull out rhsmcertd python worker to its own file (jbowes@xxxxxxxxxx)
+- clean up some compiler warnings in rhsmcertd (jbowes@xxxxxxxxxx)
+- String cleanups (alikins@xxxxxxxxxx)
+- 790217: install-num-migrate-to-rhsm shouldn't copy both Desktop and
+ Workstation product certs. (awood@xxxxxxxxxx)
+
+* Mon Feb 13 2012 Michael Stead <mstead@xxxxxxxxxx> 0.99.7-1
+- Improve relevancy of details on my installed products tab.
+ (dgoodwin@xxxxxxxxxx)
+- 719743: Added better punctuation to one status message (bkearney@xxxxxxxxxx)
+- Have client check sockets on non-stacked entitlements as well.
+ (dgoodwin@xxxxxxxxxx)
+- New date compare implemetation for determining start/end dates
+ (mstead@xxxxxxxxxx)
+- Add "zanata-pull" and "zanata-push" makefile targets (alikins@xxxxxxxxxx)
+- as_IN seems busted on RHEL6, so skip it (alikins@xxxxxxxxxx)
+- pep8/make stylish cleanups (alikins@xxxxxxxxxx)
+- 741155: Fixed start/end date calculations for My Installed Software tab
+ (mstead@xxxxxxxxxx)
+- fixes for po files from zanata (alikins@xxxxxxxxxx)
+- new po files from zanata (alikins@xxxxxxxxxx)
+- 767620: Add manage_repos config option. (dgoodwin@xxxxxxxxxx)
+- 784031: remove katello plugin (cduryee@xxxxxxxxxx)
+- Make return code from import consistent with subscribe. (awood@xxxxxxxxxx)
+- Add Fedora release target. (dgoodwin@xxxxxxxxxx)
+
* Wed Feb 01 2012 Devan Goodwin <dgoodwin@xxxxxxxx> 0.99.6-1
- 783542: Return code for bad input to install-num-migrate-to-rhsm should be 1.
(awood@xxxxxxxxxx)
--
scm-commits mailing list
scm-commits@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/scm-commits