diff --git a/0000-tree-preserve-timestamps.patch b/0000-tree-preserve-timestamps.patch deleted file mode 100644 index 2e432a52d9f912e9df4ca4a31b0052d71b15c911..0000000000000000000000000000000000000000 --- a/0000-tree-preserve-timestamps.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tree-1.6.0/Makefile.preserve-timestamps tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.preserve-timestamps 2011-06-27 16:11:26.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-06-27 16:12:36.394443602 +0100 -@@ -97,9 +97,9 @@ install: tree - 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 doc/$(MAN) $(MANDIR)/$(MAN) -+ install -p doc/$(MAN) $(MANDIR)/$(MAN) - - distclean: - if [ -f tree.o ]; then rm *.o; fi diff --git a/0001-tree-args.patch b/0001-tree-args.patch deleted file mode 100644 index 5fa5dd266ea8ea1abe59d5b6d1e7506380cce30d..0000000000000000000000000000000000000000 --- a/0001-tree-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.6.0/tree.c.args tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.args 2013-04-11 11:53:47.676572649 +0100 -+++ tree-1.6.0/tree.c 2013-04-11 11:56:10.962350448 +0100 -@@ -536,6 +536,8 @@ void usage(int n) - " --filelimit # Do not descend dirs with more than # files in them.\n" - " --timefmt Print and format time according to the format .\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" diff --git a/0002-tree-dircolors-ec.patch b/0002-tree-dircolors-ec.patch deleted file mode 100644 index bc05a9d1e98ab0a5463459a8dfe390150f26be5c..0000000000000000000000000000000000000000 --- a/0002-tree-dircolors-ec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.6.0/color.c.dircolors-ec tree-1.6.0/color.c ---- tree-1.6.0/color.c.dircolors-ec 2013-07-09 13:29:19.431819355 +0100 -+++ tree-1.6.0/color.c 2013-07-09 13:29:48.820987889 +0100 -@@ -190,7 +190,7 @@ void parse_dir_colors() - if (!norm_flgs) norm_flgs = scopy("00"); - - if (!endcode) { -- sprintf(buf,"%s%s%s",leftcode,norm_flgs,rightcode); -+ sprintf(buf,"%s0%s",leftcode,rightcode); - endcode = scopy(buf); - } - diff --git a/0003-tree-size-field-len.patch b/0003-tree-size-field-len.patch deleted file mode 100644 index dff3dcbdb5b4fbae8e322c74ae0f344d97a73cf5..0000000000000000000000000000000000000000 --- a/0003-tree-size-field-len.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up tree-1.7.0/tree.c.size-field-len tree-1.7.0/tree.c ---- tree-1.7.0/tree.c.size-field-len 2014-04-25 16:30:51.539046882 +0100 -+++ tree-1.7.0/tree.c 2014-04-25 16:32:20.098483921 +0100 -@@ -1247,8 +1247,8 @@ int psize(char *buf, off_t size) - - if (hflag || siflag) { - for (idx=size= (usize*usize); idx++,size/=usize); -- if (!idx) return sprintf(buf, " %4d", (int)size); -- else return sprintf(buf, ((size/usize) >= 10)? " %3.0f%c" : " %3.1f%c" , (float)size/(float)usize,unit[idx]); -+ if (!idx) return sprintf(buf, " %5d", (int)size); -+ else return sprintf(buf, ((size/usize) >= 10)? " %4.0f%c" : " %4.1f%c" , (float)size/(float)usize,unit[idx]); - } else return sprintf(buf, sizeof(off_t) == sizeof(long long)? " %11lld" : " %9ld", (long long int)size); - } - diff --git a/tree.spec b/tree.spec index 26a7efae809b3c97d42a18335508af6adbc220e1..6f841d59a1d805843b73c4b2f098979993286322 100644 --- a/tree.spec +++ b/tree.spec @@ -1,17 +1,12 @@ Name: tree Version: 1.7.0 -Release: 17 +Release: 18 Summary: Tree file viewer tool License: GPLv2+ URL: http://mama.indstate.edu/users/ice/tree/ Source0: ftp://mama.indstate.edu/linux/tree/%{name}-%{version}.tgz -Patch0: 0000-tree-preserve-timestamps.patch -Patch1: 0001-tree-args.patch -Patch2: 0002-tree-dircolors-ec.patch -Patch3: 0003-tree-size-field-len.patch - BuildRequires: gcc git %description @@ -49,11 +44,17 @@ install -D -m 644 doc/tree.1 $RPM_BUILD_ROOT%{_mandir}/man1/tree.1 %{_mandir}/man1/* %changelog +* Wed Jan 8 2020 openEuler BuildTeam - 1.7.0-18 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:Repackage + * Wed Aug 21 2019 zhanghaibo - 1.7.0-17 -- Type:enhancemnet +- Type:enhancement - ID:NA - SUG:NA -- DESCi:openEuler Debranding +- DESC:openEuler Debranding * Tue Aug 20 2019 huangzheng - 1.7.0-16 - Type:enhancement