OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jan-2007 19:44:26
Branch: HEAD Handle: 2007011018442500
Modified files:
openpkg-src/tree tree.patch tree.spec
Log:
upgrading package: tree 1.5.0 -> 1.5.1
Summary:
Revision Changes Path
1.3 +35 -33 openpkg-src/tree/tree.patch
1.4 +3 -3 openpkg-src/tree/tree.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tree/tree.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 tree.patch
--- openpkg-src/tree/tree.patch 27 Oct 2006 18:21:32 -0000 1.2
+++ openpkg-src/tree/tree.patch 10 Jan 2007 18:44:25 -0000 1.3
@@ -1,6 +1,6 @@
-Index: tree.1
---- tree.1.orig 2004-08-15 01:29:06 +0200
-+++ tree.1 2006-10-27 20:20:38 +0200
+Index: man/tree.1
+--- man/tree.1.orig 2007-01-09 21:53:30 +0100
++++ man/tree.1 2007-01-10 19:42:01 +0100
@@ -25,8 +25,8 @@
.br
.SH DESCRIPTION
@@ -12,12 +12,7 @@
\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
-@@ -139,11 +139,11 @@
- .TP
- .B -q
- Print non-printable characters in filenames as question marks instead of
the default
--carrot notation.
-+caret notation.
+@@ -149,7 +149,7 @@
.PP
.TP
.B -N
@@ -27,24 +22,24 @@
.TP
.B -r
Index: tree.c
---- tree.c.orig 2004-08-16 03:07:21 +0200
-+++ tree.c 2006-10-27 20:20:38 +0200
-@@ -19,9 +19,6 @@
-
- #ifdef LINUX_BIGFILE
- # define _LARGEFILE64_SOURCE
--#else
--# define stat64 stat
--# define lstat64 lstat
- #endif
+--- tree.c.orig 2007-01-09 22:07:16 +0100
++++ tree.c 2007-01-10 19:42:47 +0100
+@@ -17,7 +17,9 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#if defined(__linux__)
+ #include <features.h>
++#endif
#include <stdlib.h>
-@@ -38,6 +35,12 @@
+ #include <stdio.h>
+ #include <time.h>
+@@ -32,6 +34,12 @@
#include <limits.h>
#include <pwd.h>
#include <grp.h>
+
-+#if !defined(LINUX_BIGFILE)
++#if !defined(LINUX_BIGFILE) && defined(__linux__)
+# define stat64 stat
+# define lstat64 lstat
+#endif
@@ -52,24 +47,31 @@
#ifdef __EMX__ /* for OS/2 systems */
# define INCL_DOSFILEMGR
# define INCL_DOSNLS
-@@ -189,7 +192,9 @@
- FILE *outfile;
- int *dirs, maxdirs;
+@@ -181,7 +189,7 @@
-+#ifdef __linux__
+ #ifdef CYGWIN
+ extern int MB_CUR_MAX;
+-#else
++#elif defined(__linux__)
extern size_t MB_CUR_MAX;
-+#endif
+ #endif
- int main(int argc, char **argv)
- {
-@@ -200,8 +205,9 @@
+@@ -194,7 +202,8 @@
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;
+ inodeflag = devflag = FALSE;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
- Level = -1;
-
+ dirs[0] = 0;
+@@ -624,7 +633,7 @@
+ #ifdef __USE_FILE_OFFSET64
+ if (inodeflag) sprintf(path," %7lld",(*dir)->inode);
+ #else
+- if (inodeflag) sprintf(path," %7ld",(*dir)->inode);
++ if (inodeflag) sprintf(path," %7ld", (long int)((*dir)->inode));
+ #endif
+ if (devflag) sprintf(path+strlen(path), " %3d", (int)(*dir)->dev);
+ #ifdef __EMX__
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tree/tree.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 tree.spec
--- openpkg-src/tree/tree.spec 1 Jan 2007 17:42:27 -0000 1.3
+++ openpkg-src/tree/tree.spec 10 Jan 2007 18:44:25 -0000 1.4
@@ -32,8 +32,8 @@
Class: EVAL
Group: ShellUtils
License: GPL
-Version: 1.5.0
-Release: 20061027
+Version: 1.5.1
+Release: 20070110
# list of sources
Source0: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
@@ -79,7 +79,7 @@
%{l_shtool} install -c -s -m 755 \
tree $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
- tree.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ man/tree.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
