rpms/smolt/devel smoltFirstBoot.py, NONE, 1.1 smolt.spec, 1.42, 1.43 firstboot.patch, 1.1, NONE languages.patch, 1.2, NONE selinux.patch, 1.2, NONE
Michael Patrick McGrath (mmcgrath)
fedora-extras-commits at redhat.com
Tue Jan 8 15:54:59 UTC 2008
- Previous message (by thread): rpms/gnome-panel/F-8 .cvsignore, 1.62, 1.63 gnome-panel.spec, 1.229, 1.230 sources, 1.63, 1.64
- Next message (by thread): rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.41, 1.42 mauve_tests, 1.5, 1.6 sources, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mmcgrath
Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25626
Modified Files:
smolt.spec
Added Files:
smoltFirstBoot.py
Removed Files:
firstboot.patch languages.patch selinux.patch
Log Message:
Fixed firstboot
--- NEW FILE smoltFirstBoot.py ---
from gtk import *
import string
import gtk
import gobject
import sys
import rhpl.iconv
import os
import commands
from firstboot.config import *
from firstboot.constants import *
from firstboot.functions import *
from firstboot.module import *
# 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 moduleClass(Module):
def __init__(self):
Module.__init__(self)
self.priority = 107
self.sidebarTitle = _("Hardware Profile")
self.title = _("Hardware Profile")
self.icon = "smolt.png"
def apply(self, interface, testing=False):
if self.okButton.get_active() == True:
if testing:
import logging
logging.info("Running in testing mode, so not sending information")
return RESULT_SUCCESS
# You'd think I know better than this.
result = os.system('/sbin/chkconfig smolt on')
result = os.system('/usr/bin/smoltSendProfile -r -a &')
return RESULT_SUCCESS
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 RESULT_FAILURE
elif rc == 1:
return RESULT_SUCCESS
def createScreen(self):
self.vbox = gtk.VBox()
self.vbox.set_size_request(400, 200)
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)
def initializeUI(self):
pass
Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- smolt.spec 8 Jan 2008 14:12:45 -0000 1.42
+++ smolt.spec 8 Jan 2008 15:54:22 -0000 1.43
@@ -1,7 +1,7 @@
Name: smolt
Summary: Fedora hardware profiler
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?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://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
+Source1: smoltFirstBoot.py
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -64,6 +65,7 @@
%prep
%setup -q
+%{__cp} %{SOURCE1} client/
%build
cd client/
@@ -104,12 +106,13 @@
%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
%{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
+%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/themes/default/
%{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
%{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
%{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
%{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
%{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
-%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/pixmaps/smolt.png
+%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
@@ -170,7 +173,7 @@
%files firstboot
%defattr(-,root,root,-)
%{_datadir}/firstboot/modules/smolt.py*
-%{_datadir}/firstboot/pixmaps/smolt.png
+%{_datadir}/firstboot/themes/default/smolt.png
%files gui
%defattr(-,root,root,-)
@@ -179,6 +182,9 @@
%{_bindir}/smoltGui
%changelog
+* Thu Jan 08 2008 Mike McGrath <mmcgrath at redhat.com> 1.0-4
+- Fixed firstboot
+
* Thu Jan 08 2008 Mike McGrath <mmcgrath at redhat.com> 1.0-3
- Added python-urlgrabber as a requires - 427969
--- firstboot.patch DELETED ---
--- languages.patch DELETED ---
--- selinux.patch DELETED ---
- Previous message (by thread): rpms/gnome-panel/F-8 .cvsignore, 1.62, 1.63 gnome-panel.spec, 1.229, 1.230 sources, 1.63, 1.64
- Next message (by thread): rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec, 1.41, 1.42 mauve_tests, 1.5, 1.6 sources, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list