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: 30-Aug-2007 19:25:21
Branch: HEAD Handle: 2007083018251901
Modified files:
openpkg-src/pv pv.patch pv.spec
Log:
upgrading package: pv 1.0.1 -> 1.1.0
Summary:
Revision Changes Path
1.6 +15 -15 openpkg-src/pv/pv.patch
1.35 +2 -2 openpkg-src/pv/pv.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 pv.patch
--- openpkg-src/pv/pv.patch 5 Aug 2007 06:08:09 -0000 1.5
+++ openpkg-src/pv/pv.patch 30 Aug 2007 17:25:19 -0000 1.6
@@ -1,7 +1,7 @@
Index: src/pv/file.c
---- src/pv/file.c.orig 2007-08-04 22:37:30 +0200
-+++ src/pv/file.c 2007-08-05 08:03:14 +0200
-@@ -30,27 +30,27 @@
+--- src/pv/file.c.orig 2007-08-30 12:58:38 +0200
++++ src/pv/file.c 2007-08-30 19:23:08 +0200
+@@ -34,27 +34,27 @@
*/
void pv_calc_total_size(opts_t opts)
{
@@ -33,7 +33,7 @@
if (rc == 0)
rc = access(opts->argv[i], R_OK);
}
-@@ -72,12 +72,12 @@
+@@ -76,12 +76,12 @@
* them and seeking to the end.
*/
if (strcmp(opts->argv[i], "-") == 0) {
@@ -48,8 +48,8 @@
+ opts->size += lseek(fd, 0, SEEK_END);
close(fd);
}
- } else {
-@@ -95,8 +95,8 @@
+ } else if (S_ISREG(sb.st_mode)) {
+@@ -150,8 +150,8 @@
*/
int pv_next_file(opts_t opts, int filenum, int oldfd)
{
@@ -60,7 +60,7 @@
int fd;
if (oldfd > 0) {
-@@ -118,7 +118,7 @@
+@@ -173,7 +173,7 @@
if (strcmp(opts->argv[filenum], "-") == 0) {
fd = STDIN_FILENO;
} else {
@@ -69,7 +69,7 @@
if (fd < 0) {
fprintf(stderr, "%s: %s: %s: %s\n",
opts->program_name,
-@@ -128,7 +128,7 @@
+@@ -183,7 +183,7 @@
}
}
@@ -78,7 +78,7 @@
fprintf(stderr, "%s: %s: %s: %s\n",
opts->program_name,
_("failed to stat file"),
-@@ -137,7 +137,7 @@
+@@ -192,7 +192,7 @@
return -1;
}
@@ -88,18 +88,18 @@
opts->program_name,
_("failed to stat output file"), strerror(errno));
Index: src/pv/loop.c
---- src/pv/loop.c.orig 2007-08-04 22:37:30 +0200
-+++ src/pv/loop.c 2007-08-05 08:04:05 +0200
-@@ -37,7 +37,7 @@
+--- src/pv/loop.c.orig 2007-08-30 12:58:38 +0200
++++ src/pv/loop.c 2007-08-30 19:24:30 +0200
+@@ -57,7 +57,7 @@
struct timeval start_time, next_update, next_reset, cur_time;
struct timeval init_time;
- long double elapsed, tilreset;
+ long double elapsed;
- struct stat64 sb;
+ struct stat sb;
int fd, n;
- fd = -1;
-@@ -73,7 +73,7 @@
+ /*
+@@ -106,7 +106,7 @@
return 1;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pv/pv.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 pv.spec
--- openpkg-src/pv/pv.spec 5 Aug 2007 06:08:09 -0000 1.34
+++ openpkg-src/pv/pv.spec 30 Aug 2007 17:25:20 -0000 1.35
@@ -32,8 +32,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 1.0.1
-Release: 20070805
+Version: 1.1.0
+Release: 20070830
# list of sources
Source0:
http://switch.dl.sourceforge.net/pipeviewer/pv-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
