rpms/tree/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tree-1.2-carrot.patch, 1.1, 1.2 tree-1.2-colour.patch, 1.3, 1.4 tree-1.2-no-strip.patch, 1.3, 1.4 tree-preserve-timestamps.patch, 1.1, 1.2 tree.spec, 1.26, 1.27 tree-charset.patch, 1.1, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Apr 25 11:34:45 UTC 2008
- Previous message (by thread): rpms/dstat/devel dstat-0.6.7-dbus.patch, NONE, 1.1 dstat.spec, 1.8, 1.9
- Next message (by thread): rpms/system-config-network/F-9 .cvsignore, 1.30, 1.31 sources, 1.34, 1.35 system-config-network.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7476
Modified Files:
.cvsignore sources tree-1.2-carrot.patch tree-1.2-colour.patch
tree-1.2-no-strip.patch tree-preserve-timestamps.patch
tree.spec
Removed Files:
tree-charset.patch
Log Message:
* Fri Apr 25 2008 Tim Waugh <twaugh at redhat.com> 1.5.1.1-1
- 1.5.1.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 Sep 2004 13:07:44 -0000 1.4
+++ .cvsignore 25 Apr 2008 11:34:08 -0000 1.5
@@ -1,2 +1,3 @@
tree-1.4b3.tgz
tree-1.5.0.tgz
+tree-1.5.1.1.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Sep 2004 13:07:44 -0000 1.4
+++ sources 25 Apr 2008 11:34:08 -0000 1.5
@@ -1 +1 @@
-e0d090c564e7ea5afa16bac80620c7e0 tree-1.5.0.tgz
+f8fc70a9260b50bf8b4613e9d5f5e589 tree-1.5.1.1.tgz
tree-1.2-carrot.patch:
Index: tree-1.2-carrot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-1.2-carrot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tree-1.2-carrot.patch 9 Sep 2004 13:26:18 -0000 1.1
+++ tree-1.2-carrot.patch 25 Apr 2008 11:34:08 -0000 1.2
@@ -1,11 +1,7 @@
---- tree-1.2/tree.1.carrot Tue Oct 10 16:51:25 2000
-+++ tree-1.2/tree.1 Tue Oct 10 16:53:42 2000
-@@ -107,11 +107,11 @@
- .TP
- .B -q
- Print non-printable characters in filenames as question marks instead of the default
--carrot notation.
-+caret notation.
+diff -up tree-1.5.1.1/man/tree.1.carrot tree-1.5.1.1/man/tree.1
+--- tree-1.5.1.1/man/tree.1.carrot 2007-06-11 14:22:14.000000000 +0100
++++ tree-1.5.1.1/man/tree.1 2008-04-25 12:25:40.000000000 +0100
+@@ -149,7 +149,7 @@ caret notation.
.PP
.TP
.B -N
@@ -13,4 +9,4 @@
+Print non-printable characters as is instead of the default caret notation.
.PP
.TP
- .B -t
+ .B -r
tree-1.2-colour.patch:
Index: tree-1.2-colour.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-1.2-colour.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tree-1.2-colour.patch 13 Sep 2004 13:07:44 -0000 1.3
+++ tree-1.2-colour.patch 25 Apr 2008 11:34:08 -0000 1.4
@@ -1,6 +1,7 @@
---- tree-1.5.0/tree.1.colour 2004-09-13 13:58:15.805852115 +0100
-+++ tree-1.5.0/tree.1 2004-09-13 13:58:15.817849826 +0100
-@@ -25,8 +25,8 @@
+diff -up tree-1.5.1.1/man/tree.1.colour tree-1.5.1.1/man/tree.1
+--- tree-1.5.1.1/man/tree.1.colour 2008-04-25 12:26:21.000000000 +0100
++++ tree-1.5.1.1/man/tree.1 2008-04-25 12:26:21.000000000 +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
@@ -11,16 +12,17 @@
\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
---- tree-1.5.0/tree.c.colour 2004-08-16 02:07:21.000000000 +0100
-+++ tree-1.5.0/tree.c 2004-09-13 13:59:40.070771629 +0100
-@@ -200,8 +200,9 @@
+diff -up tree-1.5.1.1/tree.c.colour tree-1.5.1.1/tree.c
+--- tree-1.5.1.1/tree.c.colour 2007-06-11 14:22:06.000000000 +0100
++++ tree-1.5.1.1/tree.c 2008-04-25 12:27:14.000000000 +0100
+@@ -194,8 +194,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 = 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;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
+ dirs[0] = 0;
Level = -1;
-
tree-1.2-no-strip.patch:
Index: tree-1.2-no-strip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-1.2-no-strip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tree-1.2-no-strip.patch 13 Sep 2004 13:07:44 -0000 1.3
+++ tree-1.2-no-strip.patch 25 Apr 2008 11:34:08 -0000 1.4
@@ -1,20 +1,21 @@
---- tree-1.5.0/Makefile.no-strip 2004-08-14 23:07:56.000000000 +0100
-+++ tree-1.5.0/Makefile 2004-09-13 14:00:18.932355388 +0100
+diff -up tree-1.5.1.1/Makefile.no-strip tree-1.5.1.1/Makefile
+--- tree-1.5.1.1/Makefile.no-strip 2007-06-11 14:22:47.000000000 +0100
++++ tree-1.5.1.1/Makefile 2008-04-25 12:28:06.000000000 +0100
@@ -9,7 +9,7 @@
CC=gcc
- #CFLAGS=-ggdb -Wall -DLINUX_BIGFILE
- CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX_BIGFILE
+ #CFLAGS=-ggdb -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS=-O2 -Wall -fomit-frame-pointer -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-LDFLAGS=-s
+LDFLAGS=
# Uncomment for FreeBSD:
#CC=gcc
-@@ -55,7 +55,7 @@
+@@ -62,7 +62,7 @@ install:
install -d $(BINDIR)
install -d $(MANDIR)
if [ -e $(TREE_DEST) ]; then \
- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
+ install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
fi
- install $(MAN) $(MANDIR)/$(MAN)
+ install man/$(MAN) $(MANDIR)/$(MAN)
tree-preserve-timestamps.patch:
Index: tree-preserve-timestamps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree-preserve-timestamps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tree-preserve-timestamps.patch 6 Feb 2007 17:01:41 -0000 1.1
+++ tree-preserve-timestamps.patch 25 Apr 2008 11:34:08 -0000 1.2
@@ -1,14 +1,15 @@
---- tree-1.5.0/Makefile.preserve-timestamps 2007-02-06 17:00:42.000000000 +0000
-+++ tree-1.5.0/Makefile 2007-02-06 17:00:49.000000000 +0000
-@@ -55,9 +55,9 @@
+diff -up tree-1.5.1.1/Makefile.preserve-timestamps tree-1.5.1.1/Makefile
+--- tree-1.5.1.1/Makefile.preserve-timestamps 2008-04-25 12:30:41.000000000 +0100
++++ tree-1.5.1.1/Makefile 2008-04-25 12:31:14.000000000 +0100
+@@ -62,9 +62,9 @@ install:
install -d $(BINDIR)
install -d $(MANDIR)
if [ -e $(TREE_DEST) ]; then \
- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
+ install -p $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
fi
-- install $(MAN) $(MANDIR)/$(MAN)
-+ install -p $(MAN) $(MANDIR)/$(MAN)
+- install man/$(MAN) $(MANDIR)/$(MAN)
++ install -p man/$(MAN) $(MANDIR)/$(MAN)
distclean:
if [ -f tree.o ]; then rm *.o; fi
Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tree.spec 11 Feb 2008 16:23:37 -0000 1.26
+++ tree.spec 25 Apr 2008 11:34:08 -0000 1.27
@@ -1,16 +1,15 @@
Summary: A utility which displays a tree view of the contents of directories
Name: tree
-Version: 1.5.0
-Release: 9%{?dist}
+Version: 1.5.1.1
+Release: 1%{?dist}
Group: Applications/File
License: GPLv2+
Url: http://mama.indstate.edu/users/ice/tree/
-Source: ftp://mama.indstate.edu/linux/tree/tree-1.5.0.tgz
+Source: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
Patch1: tree-1.2-carrot.patch
Patch2: tree-1.2-colour.patch
Patch3: tree-1.2-no-strip.patch
-Patch4: tree-charset.patch
-Patch5: tree-preserve-timestamps.patch
+Patch4: tree-preserve-timestamps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -23,8 +22,7 @@
%patch1 -p1 -b .carrot
%patch2 -p1 -b .colour
%patch3 -p1 -b .no-strip
-%patch4 -p1 -b .charset
-%patch5 -p1 -b .preserve-timestamps
+%patch4 -p1 -b .preserve-timestamps
%build
make CFLAGS="$RPM_OPT_FLAGS" "CPPFLAGS=$(getconf LFS_CFLAGS)" %{?_smp_mflags}
@@ -49,6 +47,9 @@
%doc README LICENSE
%changelog
+* Fri Apr 25 2008 Tim Waugh <twaugh at redhat.com> 1.5.1.1-1
+- 1.5.1.1.
+
* Mon Feb 11 2008 Tim Waugh <twaugh at redhat.com> 1.5.0-9
- Rebuild for GCC 4.3.
--- tree-charset.patch DELETED ---
- Previous message (by thread): rpms/dstat/devel dstat-0.6.7-dbus.patch, NONE, 1.1 dstat.spec, 1.8, 1.9
- Next message (by thread): rpms/system-config-network/F-9 .cvsignore, 1.30, 1.31 sources, 1.34, 1.35 system-config-network.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list