rpms/tree/devel tree-charset.patch,NONE,1.1 tree.spec,1.20,1.21

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/tree/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10095

Modified Files:
	tree.spec 
Added Files:
	tree-charset.patch 
Log Message:
* Fri Dec 15 2006 Tim Waugh <twaugh at redhat.com> 1.5.0-5
- Fixed '--charset' option (bug #188884).
- Resolves: rhbz#188884


tree-charset.patch:
 tree.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE tree-charset.patch ---
--- tree-1.5.0/tree.c.charset	2006-12-15 12:30:10.000000000 +0000
+++ tree-1.5.0/tree.c	2006-12-15 12:30:30.000000000 +0000
@@ -370,6 +370,7 @@
 		}
 	      if (argv[n] != NULL)
 		charset=argv[n++];
+		break;
 	    }
 	  }
 	default:


Index: tree.spec
===================================================================
RCS file: /cvs/dist/rpms/tree/devel/tree.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tree.spec	15 Jul 2006 02:52:00 -0000	1.20
+++ tree.spec	15 Dec 2006 12:31:29 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A utility which displays a tree view of the contents of directories.
 Name: tree
 Version: 1.5.0
-Release: 4
+Release: 5%{?dist}
 Group: Applications/File
 License: GPL
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -9,6 +9,7 @@
 Patch1: tree-1.2-carrot.patch
 Patch2: tree-1.2-colour.patch
 Patch3: tree-1.2-no-strip.patch
+Patch4: tree-charset.patch
 Prefix: /usr
 BuildRoot: /var/tmp/tree-root
 
@@ -22,6 +23,7 @@
 %patch1 -p1 -b .carrot
 %patch2 -p1 -b .colour
 %patch3 -p1 -b .no-strip
+%patch4 -p1 -b .charset
 
 %build
 rm -f tree
@@ -48,6 +50,9 @@
 %doc README
 
 %changelog
+* Fri Dec 15 2006 Tim Waugh <twaugh at redhat.com> 1.5.0-5
+- Fixed '--charset' option (bug #188884).
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-4
 - rebuild