rpms/smolt/devel smolt.py,NONE,1.1 smolt.spec,1.48,1.49

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20757

Modified Files:
	smolt.spec 
Added Files:
	smolt.py 
Log Message:
* Sat Mar 08 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1.1-3
- Fixing firstboot again for 437708, 437765



--- NEW FILE smolt.py ---
from gtk import *
import string
import gtk
import gobject
import sys
import functions
import rhpl.iconv
import os
import commands

# Based off of the EULA

##
## I18N
## 
import gettext
import locale
locale.setlocale(locale.LC_ALL, '')
if os.path.isdir('po'):
    t = gettext.translation('smolt', 'po', fallback = True)
else:
    t = gettext.translation('smolt', '/usr/share/locale', fallback = True)
#gettext.bindtextdomain ("smolt", "/usr/share/locale")
#gettext.textdomain ("smolt")
#_=gettext.gettext

_ = t.gettext
class childWindow:
    #You must specify a runPriority for the order in which you wish your module to run
    runPriority = 107
    moduleName = (_("Hardware Profile"))

    def launch(self, doDebug = None):
        self.doDebug = doDebug
        if self.doDebug:
            print "initializing smolt module"

        self.vbox = gtk.VBox()
        self.vbox.set_size_request(400, 200)

        msg = (_("Hardware Profile"))

        title_pix = functions.imageFromFile("smolt.png")

        internalVBox = gtk.VBox()
        internalVBox.set_border_width(10)
        internalVBox.set_spacing(5)

        textBuffer = gtk.TextBuffer()
        textView = gtk.TextView()
        textView.set_editable(False)
        textSW = gtk.ScrolledWindow()
        textSW.set_shadow_type(gtk.SHADOW_IN)
        textSW.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
        textSW.add(textView)

        label = gtk.Label(_("Smolt is a hardware profiler for The Fedora "
                "Project.  Submitting your profile is a great way to give back "
                "to the community as this information is used to help focus our"
                " efforts on popular hardware and platforms.  Submissions are "
                "anonymous.  Sending your profile will enable a monthly update."))

        label.set_line_wrap(True)
        label.set_alignment(0.0, 0.5)
        label.set_size_request(500, -1)
        internalVBox.pack_start(label, False, True)


        iter = textBuffer.get_iter_at_offset(0)

        for line in os.popen('/usr/bin/smoltSendProfile -p', 'r'):
        	textBuffer.insert(iter, line)

        textView.set_buffer(textBuffer)
            
        self.okButton = gtk.RadioButton(None, (_("_Send Profile")))
        self.noButton = gtk.RadioButton(self.okButton, (_("D_o not send profile")))
        self.noButton.set_active(True)

        internalVBox.pack_start(textSW, True)
        internalVBox.pack_start(self.okButton, False)
        internalVBox.pack_start(self.noButton, False)
        
        self.vbox.pack_start(internalVBox, True, 5)
        return self.vbox, title_pix, msg

    def apply(self, notebook):
        if self.okButton.get_active() == True:
            # You'd think I know better than this.
            result = os.system('/sbin/chkconfig smolt on')
            result = os.system('/usr/bin/smoltSendProfile -r -a &')
            return 0
        else:
            dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_NONE,
                (_("Are you sure you wouldn't like to send the profile?  " 
                "Submitting your profile is a valuable source of information "
                "for our development and can help troubleshoot issues that "
                "may come up with your hardware.")))

            dlg.set_position(gtk.WIN_POS_CENTER)
            dlg.set_modal(True)

            continueButton = dlg.add_button(_("_Reconsider sending"), 0)
            shutdownButton = dlg.add_button(_("_No, do not send."), 1)
            continueButton.grab_focus()

            rc = dlg.run()
            dlg.destroy()

            if rc == 0:
                return None
            elif rc == 1:
                return 0



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- smolt.spec	8 Mar 2008 18:05:02 -0000	1.48
+++ smolt.spec	2 Apr 2008 20:40:28 -0000	1.49
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.1.1.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -10,6 +10,7 @@
 # This will get fixed as soon as hosted can create attachments directly
 
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
+Source1: smolt.py
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -87,7 +88,8 @@
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
 %{__mkdir} -p %{buildroot}/%{_initrddir}
-%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
+#%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
+%{__mv} %{SOURCE1} %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
 
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
@@ -173,6 +175,12 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Sat Mar 08 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1.1-3
+- Fixing firstboot again for 437708, 437765
+
+* Sat Mar 08 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1.1-2
+- Fix firstboot for 437708, 437765
+
 * Sat Mar 08 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1.1-1
 - Upstream released new version