Compare commits
No commits in common. "967e7c7621230cd3a012d903b39ca6f915e37579" and "acae5f2f8b4c5715334f6a5184161df10c3cb3ba" have entirely different histories.
967e7c7621
...
acae5f2f8b
39
0000-Fix-tree-args-option-displayed-incomplete.patch
Normal file
39
0000-Fix-tree-args-option-displayed-incomplete.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 894f81c355d80445d9117194d458381b73da989f Mon Sep 17 00:00:00 2001
|
||||||
|
From: xueyamao <xueyamao@kylinos.cn>
|
||||||
|
Date: Sun, 24 Jul 2022 18:29:29 -0700
|
||||||
|
Subject: [PATCH]tree:add --du and --prune description in usage()
|
||||||
|
|
||||||
|
In usage(), '--du' and "--prune" options are supported,
|
||||||
|
but the description of them is not given.
|
||||||
|
So we add --du and --prune description in usage().
|
||||||
|
|
||||||
|
Signed-off-by: xueyamao xueyamao@kylinos.cn
|
||||||
|
---
|
||||||
|
tree.c | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tree.c b/tree.c
|
||||||
|
index a633c57..e235853 100644
|
||||||
|
--- a/tree.c
|
||||||
|
+++ b/tree.c
|
||||||
|
@@ -632,7 +632,7 @@ void usage(int n)
|
||||||
|
"\t[-L level [-R]] [-P pattern] [-I pattern] [-o filename] [--version]\n"
|
||||||
|
"\t[--help] [--inodes] [--device] [--noreport] [--nolinks] [--dirsfirst]\n"
|
||||||
|
"\t[--charset charset] [--filelimit[=]#] [--si] [--timefmt[=]<f>]\n"
|
||||||
|
- "\t[--sort[=]<name>] [--matchdirs] [--ignore-case] [--fromfile] [--]\n"
|
||||||
|
+ "\t[--sort[=]<name>] [--matchdirs] [--ignore-case] [--fromfile] [--du] [--prune] [--]\n"
|
||||||
|
"\t[<directory list>]\n");
|
||||||
|
if (n < 2) return;
|
||||||
|
fprintf(stdout,
|
||||||
|
@@ -653,6 +653,8 @@ void usage(int n)
|
||||||
|
" --filelimit # Do not descend dirs with more than # files in them.\n"
|
||||||
|
" --timefmt <f> Print and format time according to the format <f>.\n"
|
||||||
|
" -o filename Output to file instead of stdout.\n"
|
||||||
|
+ " --du Print directory sizes.\n"
|
||||||
|
+ " --prune Prune empty directories from the output.\n"
|
||||||
|
" ------- File options -------\n"
|
||||||
|
" -q Print non-printable characters as '?'.\n"
|
||||||
|
" -N Print non-printable characters as is.\n"
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From c90782c682df0488d51e245d6413be336b7f6782 Mon Sep 17 00:00:00 2001
|
|
||||||
From: jammyjellyfish <jammyjellyfish255@outlook.com>
|
|
||||||
Date: Wed, 19 Apr 2023 14:46:09 +0800
|
|
||||||
Subject: [PATCH] Support specify CC
|
|
||||||
|
|
||||||
Makefile set CC compiler as gcc, and not reading CC from
|
|
||||||
environment variable. This patch lets Makefile read $CC
|
|
||||||
environment variable and use it as compiler, if exists
|
|
||||||
---
|
|
||||||
Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 752e550..0297cf7 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
|
|
||||||
PREFIX=/usr/local
|
|
||||||
|
|
||||||
-CC=gcc
|
|
||||||
+CC?=gcc
|
|
||||||
INSTALL=install
|
|
||||||
|
|
||||||
VERSION=2.1.1
|
|
||||||
--
|
|
||||||
2.40.0
|
|
||||||
|
|
||||||
BIN
tree-1.8.0.tgz
Normal file
BIN
tree-1.8.0.tgz
Normal file
Binary file not shown.
BIN
tree-2.1.1.tgz
BIN
tree-2.1.1.tgz
Binary file not shown.
27
tree.spec
27
tree.spec
@ -1,15 +1,15 @@
|
|||||||
Name: tree
|
Name: tree
|
||||||
Version: 2.1.1
|
Version: 1.8.0
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: Tree file viewer tool
|
Summary: Tree file viewer tool
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://mama.indstate.edu/users/ice/tree/
|
URL: http://mama.indstate.edu/users/ice/tree/
|
||||||
|
|
||||||
Source0: http://mama.indstate.edu/users/ice/tree/src/%{name}-%{version}.tgz
|
Source0: ftp://mama.indstate.edu/linux/tree/%{name}-%{version}.tgz
|
||||||
Source1: ftp://mama.indstate.edu/linux/tree/%{name}-%{version}.tgz
|
|
||||||
Patch0: 0001-Support-specify-CC.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
# Document --du and --prune options in help output.
|
||||||
|
Patch0: 0000-Fix-tree-args-option-displayed-incomplete.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Tree is a recursive directory listing command that produces a depth indented
|
Tree is a recursive directory listing command that produces a depth indented
|
||||||
@ -46,21 +46,6 @@ install -D -m 644 doc/tree.1 $RPM_BUILD_ROOT%{_mandir}/man1/tree.1
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jul 17 2023 Kunlin Yang <yangkunlin7@huawei.com> - 2.1.1-1
|
|
||||||
- upgrade package from 2.1.0 to 2.1.1
|
|
||||||
|
|
||||||
* Wed Apr 19 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 2.1.0-2
|
|
||||||
- Support specify CC
|
|
||||||
|
|
||||||
* Thu Feb 09 2023 Kunlin Yang <yangkunlin7@huawei.com> - 2.1.0-1
|
|
||||||
- upgrade package from 2.0.4 to 2.1.0
|
|
||||||
|
|
||||||
* Wed Nov 16 2022 Kunlin Yang <yangkunlin7@huawei.com> - 2.0.4-2
|
|
||||||
- add SOURCE http url
|
|
||||||
|
|
||||||
* Fri Oct 28 2022 Kunlin Yang <yangkunlin7@huawei.com> - 2.0.4-1
|
|
||||||
- upgrade package from 1.8.0 to 2.0.4
|
|
||||||
|
|
||||||
* Tue Jul 12 2022 xueyamao <xueyamao@kylinos.cn> - 1.8.0-3
|
* Tue Jul 12 2022 xueyamao <xueyamao@kylinos.cn> - 1.8.0-3
|
||||||
- DESC: Document --du and --prune options in help output
|
- DESC: Document --du and --prune options in help output
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user