rpms/smolt/F-12 0001-Don-t-print-information-about-the-pager-when-using.patch, NONE, 1.1 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch, NONE, 1.1 0002-fixes-the-p-option.patch, NONE, 1.1 smolt.spec, 1.76, 1.77

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30570

Modified Files:
	smolt.spec 
Added Files:
	0001-Don-t-print-information-about-the-pager-when-using.patch 
	0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch 
	0002-fixes-the-p-option.patch 
Log Message:
patching for the F12 final

0001-Don-t-print-information-about-the-pager-when-using.patch:
 sendProfile.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Don-t-print-information-about-the-pager-when-using.patch ---
>From bbcac174a9392c3b3ed3facd3a5e79b754469759 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 12:57:27 -0500
Subject: [PATCH] Don't print information about the pager when using -p

---
 client/sendProfile.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index dcf60a3..80f2c37 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -165,7 +165,8 @@ if opts.scanOnly:
 if not opts.autoSend:
     if opts.printOnly:
         for line in profile.getProfile():
-            print line
+            if not line.startswith('#'):
+                print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5


0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch:
 smoltFirstBoot.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch ---
>From 53273792667e5113972e3de85731123a30c4f288 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:46:53 -0500
Subject: [PATCH 1/2] rhpl.iconv is not required anymore by firstboot

---
 client/smoltFirstBoot.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/client/smoltFirstBoot.py b/client/smoltFirstBoot.py
index 6ce3a2a..9c44d1c 100644
--- a/client/smoltFirstBoot.py
+++ b/client/smoltFirstBoot.py
@@ -3,7 +3,6 @@ import string
 import gtk
 import gobject
 import sys
-import rhpl.iconv
 import os
 import subprocess
 import commands
-- 
1.6.2.5


0002-fixes-the-p-option.patch:
 sendProfile.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0002-fixes-the-p-option.patch ---
>From 7b61f24db0f7de3ae2d28cdafc983efd2fe46b65 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:58:54 -0500
Subject: [PATCH 2/2] fixes the -p option

---
 client/sendProfile.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index ff3a0a9..dcf60a3 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -164,6 +164,8 @@ if opts.scanOnly:
 
 if not opts.autoSend:
     if opts.printOnly:
+        for line in profile.getProfile():
+            print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-12/smolt.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- smolt.spec	21 Sep 2009 14:15:18 -0000	1.76
+++ smolt.spec	22 Oct 2009 18:24:12 -0000	1.77
@@ -2,12 +2,15 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
 Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
+Patch1: 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch
+Patch2: 0002-fixes-the-p-option.patch
+Patch3: 0001-Don-t-print-information-about-the-pager-when-using.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -70,6 +73,9 @@ ensure that deps are kept small.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 cd client/
@@ -209,6 +215,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Tue Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-4
+- Fixing firstboot for F-12
+
 * Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
 - Patched issue with translations (already upstream)