rpms/tree/F-11 sources, 1.9, 1.10 tree-1.2-no-strip.patch, 1.6, 1.7 tree-no-color-by-default.patch, 1.1, 1.2 tree.spec, 1.36, 1.37

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/tree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7260

Modified Files:
	sources tree-1.2-no-strip.patch tree-no-color-by-default.patch 
	tree.spec 
Log Message:
* Fri Nov 27 2009 Tim Waugh <twaugh at redhat.com> 1.5.3-1
- 1.5.3 (bug #517342, bug #541255).



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	27 Jan 2009 13:23:42 -0000	1.9
+++ sources	27 Nov 2009 17:18:28 -0000	1.10
@@ -1 +1 @@
-a7731a898e2c0d7e422a57a84ffbb06c  tree-1.5.2.2.tgz
+c07ce9065667a23f27aca4de8ecccb10  tree-1.5.3.tgz

tree-1.2-no-strip.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: tree-1.2-no-strip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-11/tree-1.2-no-strip.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tree-1.2-no-strip.patch	2 Sep 2008 14:42:01 -0000	1.6
+++ tree-1.2-no-strip.patch	27 Nov 2009 17:18:28 -0000	1.7
@@ -1,16 +1,7 @@
-diff -up tree-1.5.2.1/Makefile.no-strip tree-1.5.2.1/Makefile
---- tree-1.5.2.1/Makefile.no-strip	2008-08-27 19:34:43.000000000 +0100
-+++ tree-1.5.2.1/Makefile	2008-09-02 15:41:33.000000000 +0100
-@@ -21,7 +21,7 @@ MANDIR=${prefix}/man/man1
- # Linux defaults:
- #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
-+LDFLAGS=
- 
- # Uncomment for FreeBSD:
- #CFLAGS=-O2 -Wall -fomit-frame-pointer
-@@ -72,7 +72,7 @@ install:
+diff -up tree-1.5.3/Makefile.no-strip tree-1.5.3/Makefile
+--- tree-1.5.3/Makefile.no-strip	2009-10-19 19:56:28.000000000 +0100
++++ tree-1.5.3/Makefile	2009-11-27 17:10:56.209696177 +0000
+@@ -86,7 +86,7 @@ install: tree
  	install -d $(BINDIR)
  	install -d $(MANDIR)
  	if [ -e $(TREE_DEST) ]; then \

tree-no-color-by-default.patch:
 man/tree.1 |    4 ++--
 tree.c     |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Index: tree-no-color-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-11/tree-no-color-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tree-no-color-by-default.patch	10 Jun 2009 15:53:41 -0000	1.1
+++ tree-no-color-by-default.patch	27 Nov 2009 17:18:28 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up tree-1.5.2.2/man/tree.1.no-color-by-default tree-1.5.2.2/man/tree.1
---- tree-1.5.2.2/man/tree.1.no-color-by-default	2009-06-10 16:47:03.991358795 +0100
-+++ tree-1.5.2.2/man/tree.1	2009-06-10 16:47:13.134483125 +0100
+diff -up tree-1.5.3/man/tree.1.no-color-by-default tree-1.5.3/man/tree.1
+--- tree-1.5.3/man/tree.1.no-color-by-default	2009-11-27 17:11:45.079696363 +0000
++++ tree-1.5.3/man/tree.1	2009-11-27 17:11:45.097697476 +0000
 @@ -25,8 +25,8 @@ tree \- list contents of directories in 
  .br
  .SH DESCRIPTION
@@ -12,9 +12,9 @@ diff -up tree-1.5.2.2/man/tree.1.no-colo
  \fItree\fP lists the files in the current directory.  When directory
  arguments are given, \fItree\fP lists all the files and/or directories found
  in the given directories each in turn.  Upon completion of listing all
-diff -up tree-1.5.2.2/tree.c.no-color-by-default tree-1.5.2.2/tree.c
---- tree-1.5.2.2/tree.c.no-color-by-default	2009-01-22 15:02:51.000000000 +0000
-+++ tree-1.5.2.2/tree.c	2009-06-10 16:47:13.135483489 +0100
+diff -up tree-1.5.3/tree.c.no-color-by-default tree-1.5.3/tree.c
+--- tree-1.5.3/tree.c.no-color-by-default	2009-11-24 17:30:03.000000000 +0000
++++ tree-1.5.3/tree.c	2009-11-27 17:12:17.751822020 +0000
 @@ -207,8 +207,9 @@ int main(int argc, char **argv)
    q = p = dtotal = ftotal = 0;
    aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag = FALSE;
@@ -25,4 +25,4 @@ diff -up tree-1.5.2.2/tree.c.no-color-by
 +  nocolor = TRUE;
    flimit = 0;
    dirs = xmalloc(sizeof(int) * (maxdirs=4096));
-   dirs[0] = 0;
+   memset(dirs, 0, sizeof(int) * maxdirs);


Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-11/tree.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- tree.spec	10 Jun 2009 15:53:41 -0000	1.36
+++ tree.spec	27 Nov 2009 17:18:28 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: File system tree viewer
 Name: tree
-Version: 1.5.2.2
-Release: 3%{?dist}
+Version: 1.5.3
+Release: 1%{?dist}
 Group: Applications/File
 License: GPLv2+
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE
 
 %changelog
+* Fri Nov 27 2009 Tim Waugh <twaugh at redhat.com> 1.5.3-1
+- 1.5.3 (bug #517342, bug #541255).
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 10 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-3
 - Reinstate no-color-by-default patch (bug #504245).