rpms/tree/F-10 tree-no-color-by-default.patch, NONE, 1.1 sources, 1.8, 1.9 tree.spec, 1.32, 1.33

[Tim Waugh]

Author: twaugh

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

Modified Files:
	sources tree.spec 
Added Files:
	tree-no-color-by-default.patch 
Log Message:
* Wed Jun 10 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-3
- Reinstate no-color-by-default patch (bug #504245).


tree-no-color-by-default.patch:

--- NEW FILE tree-no-color-by-default.patch ---
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
@@ -25,8 +25,8 @@ tree \- list contents of directories in 
 .br
 .SH DESCRIPTION
 \fITree\fP is a recursive directory listing program that produces a depth
-indented listing of files, which is colorized ala \fIdircolors\fP if the \fBLS_COLORS\fP
-environment variable is set and output is to tty.  With no arguments,
+indented listing of files.  Color is supported ala \fIdircolors\fP if the \fBLS_COLORS\fP
+environment variable is set, output is to a tty, and the \fB-C\fP flag is used.  With no arguments,
 \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
@@ -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;
   Dflag = qflag = Nflag = Hflag = Rflag = hflag = FALSE;
-  noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE;
+  noindent = force_color = xdev = noreport = nolinks = FALSE;
   inodeflag = devflag = FALSE;
+  nocolor = TRUE;
   flimit = 0;
   dirs = xmalloc(sizeof(int) * (maxdirs=4096));
   dirs[0] = 0;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Sep 2008 14:01:22 -0000	1.8
+++ sources	10 Jun 2009 15:54:00 -0000	1.9
@@ -1 +1 @@
-73d5fa220dfef1ee9c1876c3966f1c18  tree-1.5.2.1.tgz
+a7731a898e2c0d7e422a57a84ffbb06c  tree-1.5.2.2.tgz


Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/F-10/tree.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- tree.spec	2 Sep 2008 14:06:01 -0000	1.32
+++ tree.spec	10 Jun 2009 15:54:00 -0000	1.33
@@ -1,7 +1,7 @@
-Summary: A utility which displays a tree view of the contents of directories
+Summary: File system tree viewer
 Name: tree
-Version: 1.5.2.1
-Release: 1%{?dist}
+Version: 1.5.2.2
+Release: 3%{?dist}
 Group: Applications/File
 License: GPLv2+
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -9,6 +9,7 @@ Source: ftp://mama.indstate.edu/linux/tr
 Patch1: tree-1.2-carrot.patch
 Patch2: tree-1.2-no-strip.patch
 Patch3: tree-preserve-timestamps.patch
+Patch4: tree-no-color-by-default.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -21,6 +22,7 @@ utility.
 %patch1 -p1 -b .carrot
 %patch2 -p1 -b .no-strip
 %patch3 -p1 -b .preserve-timestamps
+%patch4 -p1 -b .no-color-by-default
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" "CPPFLAGS=$(getconf LFS_CFLAGS)" %{?_smp_mflags}
@@ -45,6 +47,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE
 
 %changelog
+* Wed Jun 10 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-3
+- Reinstate no-color-by-default patch (bug #504245).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-1
+- 1.5.2.2.
+
+* Mon Nov 24 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-2
+- Better summary.
+
 * Tue Sep  2 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-1
 - Removed patch fuzz.
 - 1.5.2.1.