rpms/wlassistant/devel wlassistant-0.5.7-fix_scons_chmod_error.patch, NONE, 1.1 wlassistant.spec, 1.15, 1.16

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/wlassistant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14989

Modified Files:
	wlassistant.spec 
Added Files:
	wlassistant-0.5.7-fix_scons_chmod_error.patch 
Log Message:
fix chmod error with scons (resolves FTBFS)

wlassistant-0.5.7-fix_scons_chmod_error.patch:

--- NEW FILE wlassistant-0.5.7-fix_scons_chmod_error.patch ---
diff -up wlassistant-0.5.7/admin/generic.py.BAD wlassistant-0.5.7/admin/generic.py
--- wlassistant-0.5.7/admin/generic.py.BAD	2008-06-05 17:37:13.000000000 -0400
+++ wlassistant-0.5.7/admin/generic.py	2008-06-05 17:39:48.000000000 -0400
@@ -269,7 +269,8 @@ class genobj:
 			ret=self.env.Program(self.p_localtarget, self.p_localsource)
 			if not self.env.has_key('NOAUTOINSTALL'):
 				ins=self.env.bksys_install(self.instdir, ret)
-				if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
+				if ins and self.perms: 
+					for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
 		elif self.type=='staticlib':
 			ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
 
@@ -476,7 +477,8 @@ def generate(env):
 		if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
 		elif subdir:     install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
 		else:            install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
-		if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
+		if perms and install_list: 
+			for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(lenv.Chmod(str(i), perms))
 		env.Alias('install', install_list)
 		return install_list
 
diff -up wlassistant-0.5.7/bksys/generic.py.BAD wlassistant-0.5.7/bksys/generic.py
--- wlassistant-0.5.7/bksys/generic.py.BAD	2008-06-05 17:40:14.000000000 -0400
+++ wlassistant-0.5.7/bksys/generic.py	2008-06-05 17:41:02.000000000 -0400
@@ -244,7 +244,8 @@ class genobj:
 			ret=self.env.Program(self.p_localtarget, self.p_localsource)
 			if not self.env.has_key('NOAUTOINSTALL'):
 				ins=self.env.bksys_install(self.instdir, ret)
-				if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
+				if ins and self.perms: 
+					for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
 		elif self.type=='staticlib':
 			ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
 
@@ -462,7 +463,8 @@ def generate(env):
 		if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
 		elif subdir:     install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
 		else:            install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
-		if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
+		if perms and install_list: 
+			for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms))
 		env.Alias('install', install_list)
 		return install_list
 


Index: wlassistant.spec
===================================================================
RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wlassistant.spec	25 Mar 2008 13:10:02 -0000	1.15
+++ wlassistant.spec	5 Jun 2008 21:51:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.7
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -17,6 +17,7 @@
 Requires:       usermode, wireless-tools, net-tools, dhclient, pam
 Patch0:		wlassistant-0.5.5-rpath.patch
 Patch1:		wlassistant-0.5.7-fd_cloexec.patch
+Patch2:		wlassistant-0.5.7-fix_scons_chmod_error.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -87,6 +89,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Thu Jun  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.7-8
+- fix scons chmod error (resolve FTBFS)
+
 * Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.7-7
 - fix BuildRequires for kdelibs3-devel