================================
firstboot:source=1.3.42-0.1 (previous: 1.3.55-0.2)
cvc rdiff firstboot -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/1.3.42-0.1
================================
1.3.42-0.1 Ken VanDine ([EMAIL PROTECTED]) Sun Feb 19 00:15:24 2006
Back to a working version
firstboot-1.3.42.tar.bz2: new
sudo.patch: changed
Index: sudo.patch
====================================================================
contents(size sha1)
inode(mtime owner group)
--- sudo.patch /[EMAIL PROTECTED]:devel//[EMAIL PROTECTED]:desktop/1.3.55-0.2
+++ sudo.patch /[EMAIL PROTECTED]:devel//[EMAIL PROTECTED]:desktop/1.3.42-0.1
@@ -1,29 +1,22 @@
-diff -Naur firstboot-1.3.45.orig/src/modules/create_user.py
firstboot-1.3.45/src/modules/create_user.py
---- firstboot-1.3.45.orig/src/modules/create_user.py 2005-08-02
16:11:25.000000000 -0400
-+++ firstboot-1.3.45/src/modules/create_user.py 2005-09-07
15:57:48.000000000 -0400
+diff -ur firstboot-1.3.39.orig/src/modules/create_user.py
firstboot-1.3.39/src/modules/create_user.py
+--- firstboot-1.3.39.orig/src/modules/create_user.py 2004-11-12
16:14:21.000000000 -0500
++++ firstboot-1.3.39/src/modules/create_user.py 2005-03-10
10:12:09.942322800 -0500
@@ -68,7 +68,8 @@
internalVBox.set_spacing(10)
- label = gtk.Label(_("It is recommended that you create a system
'username' for regular "
-- "(non-administrative) use of your system. To
create a system 'username,' "
-+ "use of your system. This user will be allowed to
get elevated permissions "
-+ "when necessary (sudo). To create a system
'username,' "
- "please provide the information requested
below."))
+ label = gtk.Label(_("It is recommended that you create a system
'username' for regular "
+- "(non-administrative) use of your system. To create
a system 'username,' "
++ "use of your system. This user will be allowed to
get elevated permissions "
++ "when necessary (sudo). To create a system
'username,' "
+ "please provide the information requested below."))
- label.set_line_wrap(True)
-@@ -248,7 +249,14 @@
-
+ label.set_line_wrap(gtk.TRUE)
+@@ -235,7 +236,7 @@
+ args = [ "/usr/bin/chfn", "-f", fullName , username ]
+ executil.execWithRedirect(args[0], args, stdout = None, stderr = None)
- self.admin.setpassUser(userEnt, self.passwordEntry.get_text(), 0)
--
-+
-+ if user == None:
-+ args = [ "/usr/sbin/usermod", "-G", "wheel", username ]
-+ executil.execWithRedirect(args[0], args, stdout = None, stderr =
None)
-+ else:
-+ args = [ "/usr/sbin/usermod", "-G", "wheel", username ]
-+ executil.execWithRedirect(args[0], args, stdout = None, stderr =
None)
-+
+- args = [ "/usr/sbin/usermod", "-p", cryptPassword(password) ,
username ]
++ args = [ "/usr/sbin/usermod", "-p", cryptPassword(password) , "-G",
"wheel", username ]
+ executil.execWithRedirect(args[0], args, stdout = None, stderr = None)
+
return 0
-
- def showErrorMessage(self, text):
firstboot.recipe: changed
Index: firstboot.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- firstboot.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/1.3.55-0.2
+++ firstboot.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop/1.3.42-0.1
@@ -4,15 +4,15 @@
#
class FirstBoot(PackageRecipe):
- buildRequires = [ 'intltool:runtime' ]
+ buildRequires = [ 'intltool:runtime', 'libuser:python',
+ 'newt:python', 'pygtk:python' ]
name = "firstboot"
- version = "1.3.55"
+ version = "1.3.42"
def setup(r):
- r.addArchive('%(name)s-%(version)s.tar.bz2',
-
rpm='ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core/development/SRPMS/%(name)s-%(version)s-1.1.src.rpm')
+ r.addArchive('%(name)s-%(version)s.tar.bz2')
r.addPatch('sudo.patch')
- #r.addPatch('firstboot-1.3.33-race.patch')
+ r.addPatch('firstboot-1.3.33-race.patch')
r.Replace('RPM_BUILD_ROOT', 'INSTROOT', 'po/Makefile')
r.Replace('python2', 'python',
@@ -20,8 +20,6 @@
# needs to run before prefdm!
r.Replace('chkconfig: 35 95 95',
'chkconfig: 35 17 95', 'firstboot.init')
-
#r.Replace('gtk.TRUE','True','src/exceptionWindow.py','src/firstbootWindow.py','src/modules/*.py')
-
#r.Replace('gtk.FALSE','False','src/exceptionWindow.py','src/firstbootWindow.py','src/modules/*.py')
r.Remove('src/pixmaps/rhn*png')
r.Remove('src/modules/additional_cds.py')
r.addSource('splash.png')
@@ -29,16 +27,3 @@
r.MakeInstall(rootVar='INSTROOT')
r.Install('splash.png', '%(datadir)s/firstboot/pixmaps/splash.png')
r.Install('splash.png',
'%(datadir)s/firstboot/pixmaps/splash-small.png')
-
- for requirement in (
- 'pygtk:python', 'python:runtime', 'metacity:runtime',
- 'rhpl:python', 'libuser:python', 'system-config-date:runtime',
- 'system-config-display:runtime',
- 'system-config-language:runtime',
- 'system-config-keyboard:runtime',
- 'system-config-securitylevel:runtime',
- 'system-config-rootpassword:runtime',
- 'system-config-network:runtime',
- 'authconfig:runtime',
- ):
- r.Requires(requirement, '%(sbindir)s/firstboot')
firstboot-1.3.55.tar.bz2: removed
Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
