rpms/kleansweep/F-9 import.log, NONE, 1.1 kleansweep-generic.patch, NONE, 1.1 kleansweep-helper.patch, NONE, 1.1 kleansweep.spec, 1.5, 1.6

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/kleansweep/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/F-9

Modified Files:
	kleansweep.spec 
Added Files:
	import.log kleansweep-generic.patch kleansweep-helper.patch 
Log Message:
bug fix 449631


--- NEW FILE import.log ---
kleansweep-0_2_9-8_fc9:F-9:kleansweep-0.2.9-8.fc9.src.rpm:1212916635

kleansweep-generic.patch:

--- NEW FILE kleansweep-generic.patch ---
diff -Nur -x '*.orig' -x '*~' kleansweep-0.2.9/admin/generic.py kleansweep-0.2.9.new/admin/generic.py
--- kleansweep-0.2.9/admin/generic.py	2008-02-15 02:59:29.000000000 +0100
+++ kleansweep-0.2.9.new/admin/generic.py	2008-02-15 03:00:49.278304972 +0100
@@ -244,7 +244,8 @@
 			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 @@
 		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
 

kleansweep-helper.patch:

--- NEW FILE kleansweep-helper.patch ---
--- kleansweep-0.2.8/src/kleansweep-helper	2006-05-10 21:38:44.000000000 +0200
+++ kleansweep-0.2.8.new/src/kleansweep-helper	2007-04-03 14:40:09.000000000 +0200
@@ -34,7 +34,7 @@
 # t - obsolete thumbnails
 # O - orphaned file
 # s - broken symlink
-# t - temporary file
+# e - temporary file
 # U - unused file
 # x - broken executable
 # y - empty dir 
@@ -51,6 +51,7 @@
 # -b                        search for backup files 
 # -d                        search for duplicated files
 # -x                        search for broken executables
+# -e                        search for temporary files
 # --rpm                     perform rpm orphans check
 # --portage                 perform emerge orphans check
 # --deb                     perform deb orphans check
@@ -78,6 +79,7 @@
 our $seek_dup = 0;
 our $seek_symlinks = 0;
 our $seek_orph = 0;
+our $seek_temp_files = 0;
 our $seek_orpms = 0; #temporary helper flag used for commandline option - seek_orph is really used later
 our $seek_odebs = 0; #temporary helper flag - seek_orph is really used
 our $seek_oemerge = 0;
@@ -96,6 +98,7 @@
 our $count = 0; #number of files found (used only if seek_limit>0)
 
 our $bakfiles_re;
+our $tempfiles_re;
 
 our @path;
 our @excludedirs;
@@ -218,6 +221,7 @@
 		my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$fsize,$atime,$mtime,$ctime,$blksize,$bloks) = stat($fname);
 		$inode = $dev.$ino if $seek_dup;
 		$tag .= 'b' if $seek_bak && $fname =~ /$bakfiles_re/oi;
+		$tag .= 'e' if $seek_temp_files && $fname =~ /$tempfiles_re/oi;
 		$tag .= 'z' if $seek_empty_files && -f && -z;
 		##$tag .= 'l' if $seek_locale && $fname =~ /\.mo$/ && $fname =~ /^$localedirs_re)/o && $File::Find::dir !~ /$valid_locales_re/o;
 		##$tag .= 'U' if $seek_old && ($currtime - $atime) > $seek_old;
@@ -372,6 +376,10 @@
 $| = 1;
 
 $bakfiles_re = '(?:\.bak|\.old|\.save|\.tmp|~|-|(?:\/var\/lib\/nvidia\/\d\d\d))$|(?:\.#prelink#\.)';
+# $tempfiles_re currently only matches Gnome file-roller temporary files that
+# get left over when you try to create a tarball on a disk that's almost full
+# then tar(1) fails due to lack of disk space (Gnome bug #415638)
+$tempfiles_re = '\/\.fr.[0-9][0-9]*\.[0-9][0-9]*.*\.tar$';
 
 GetOptions('z' => \$seek_empty_files,
 	   'y' => \$seek_empty_dirs,
@@ -385,6 +393,7 @@
 	   'deb' => \$seek_odebs,
 	   ##'portage' => \$seek_oemerge,
 	   'd' => \$seek_dup,
+	   'e' => \$seek_temp_files,
 	   ##'unused=i' => \$seek_old,
 	   'limit=i' => \$seek_limit,
 	   'comp' => \$only_md5sum,


Index: kleansweep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kleansweep/F-9/kleansweep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kleansweep.spec	31 Mar 2008 17:30:51 -0000	1.5
+++ kleansweep.spec	8 Jun 2008 09:18:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          kleansweep
 Version:       0.2.9
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Reclaim disk space by finding unneeded files
 
 License:       GPLv2
@@ -8,6 +8,10 @@
 URL:           http://linux.bydg.org/~yogin/
 
 Source:        http://linux.bydg.org/~yogin/kleansweep-%{version}.tar.bz2
+
+Patch0:        %{name}-helper.patch
+Patch1:        %{name}-generic.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kdelibs3-devel, gettext, scons
@@ -21,8 +25,11 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .helper
+%patch1 -p1 -b .generic
 
 %build
+
 # disables rpath
 sed -i 's|^env.KDEuse("environ rpath")|env.KDEuse("environ")|g' SConstruct
 
@@ -67,6 +74,9 @@
 
 
 %changelog
+* Sun Jun 08 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 0.2.9-8
+- bugfix #449631
+
 * Mon Mar 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.2.9-6
 - fix build (#434026)