[csw-devel] SF.net SVN: gar:[14604] csw/mgar/pkg/pv/trunk

skayser at users.sourceforge.net skayser at users.sourceforge.net
Wed May 18 17:38:04 CEST 2011


Revision: 14604
          http://gar.svn.sourceforge.net/gar/?rev=14604&view=rev
Author:   skayser
Date:     2011-05-18 15:38:04 +0000 (Wed, 18 May 2011)

Log Message:
-----------
pv/trunk: version bump to 1.2.0

Modified Paths:
--------------
    csw/mgar/pkg/pv/trunk/Makefile
    csw/mgar/pkg/pv/trunk/checksums
    csw/mgar/pkg/pv/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/pv/trunk/files/fix-test-010.diff

Modified: csw/mgar/pkg/pv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pv/trunk/Makefile	2011-05-18 14:38:22 UTC (rev 14603)
+++ csw/mgar/pkg/pv/trunk/Makefile	2011-05-18 15:38:04 UTC (rev 14604)
@@ -1,5 +1,5 @@
 NAME = pv
-VERSION = 1.1.4
+VERSION = 1.2.0
 CATEGORIES = utils
 
 DESCRIPTION =  Monitor the progress of data through a pipe
@@ -12,31 +12,25 @@
   completion.
 endef
 
-# Project URL
-SPKG_SOURCEURL = http://www.ivarch.com/programs/pv.shtml
-
-# Source files
+VENDOR_URL   = http://www.ivarch.com/programs/pv.shtml
 MASTER_SITES = http://pipeviewer.googlecode.com/files/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-LICENSE = doc/COPYING
+DISTFILES    = $(NAME)-$(VERSION).tar.gz
+LICENSE      = doc/COPYING
 
+UPSTREAM_MASTER_SITES = $(VENDOR_URL)
+
 RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-# Test with dd (010-dd) is unrealiable because of partial reads on SPARC.
-# Upstream patch for a rewritten test is pending.
-# Substituted with 010-opencsw-cksum in the meantime.
-# See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324308
-PATCHFILES = fix-test-010.diff
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
 
+# test-012 uses tr complements (-c) which don't work with /usr/bin/tr
+PATH := /opt/csw/gnu:$(PATH)
+
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
 post-install-modulated:
-	@gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz
-	@ginstall -d -m 755 $(DOCDEST)
-	@cp $(WORKSRC)/doc/NEWS $(FILEDIR)/changelog.CSW $(DOCDEST)
+	gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz
+	ginstall -d -m 755 $(DOCDEST)
+	cp $(WORKSRC)/doc/NEWS $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pv/trunk/checksums
===================================================================
--- csw/mgar/pkg/pv/trunk/checksums	2011-05-18 14:38:22 UTC (rev 14603)
+++ csw/mgar/pkg/pv/trunk/checksums	2011-05-18 15:38:04 UTC (rev 14604)
@@ -1,3 +1 @@
-8d0eda2182640919daaf6186cd816a13  download/pv-1.1.4.tar.gz
-6e307b98bc517acb6353981bee5e686c  download/CSWpv.gspec
-f4de09711819fdb79aee3fa0c612caca  download/fix-test-010.diff
+f7cc65c850ac98c6013cc448050eee4b  pv-1.2.0.tar.gz

Modified: csw/mgar/pkg/pv/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/pv/trunk/files/changelog.CSW	2011-05-18 14:38:22 UTC (rev 14603)
+++ csw/mgar/pkg/pv/trunk/files/changelog.CSW	2011-05-18 15:38:04 UTC (rev 14604)
@@ -1,3 +1,9 @@
+pv (1.2.0,REV=2011.05.18)
+
+  * Updated to 1.2.0.
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed, 18 May 2011 17:35:36 +0200
+
 pv (1.1.4,REV=2009.05.10)
 
   * Recompiled with adjusted GAR build system (Closes: #3573).

Deleted: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff
===================================================================
--- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff	2011-05-18 14:38:22 UTC (rev 14603)
+++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff	2011-05-18 15:38:04 UTC (rev 14604)
@@ -1,50 +0,0 @@
-diff --speed-large-files --minimal -Nru pv-1.1.4.orig/tests/010-dd pv-1.1.4/tests/010-dd
---- pv-1.1.4.orig/tests/010-dd	2007-02-19 15:00:45.000000000 +0100
-+++ pv-1.1.4/tests/010-dd	2008-12-09 23:53:24.620543043 +0100
-@@ -1,14 +1,22 @@
- #!/bin/sh
- #
- # Check that dd doesn't cause a SIGPIPE and doesn't drop data.
-+#
-+# OpenCSW: 
-+# * Test with dd is unrealiable because of partial reads on SPARC.
-+# * Upstream patch for a rewritten test is pending.
-+# * Substituted with 010-opencsw-cksum in the meantime.
-+# * See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324308
- 
- #COUNT1=`cat /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c`
- # NB cat gets it wrong sometimes too!
--COUNT1=100000000
--COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c`
-+#COUNT1=100000000
-+#COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c`
- 
- #echo "[$COUNT1] [$COUNT2]"
- 
--test "x$COUNT1" = "x$COUNT2"
-+#test -z """x$COUNT1" = "x$COUNT2"
-+
-+:
- 
- # EOF
-diff --speed-large-files --minimal -Nru pv-1.1.4.orig/tests/010-opencsw-cksum pv-1.1.4/tests/010-opencsw-cksum
---- pv-1.1.4.orig/tests/010-opencsw-cksum	1970-01-01 01:00:00.000000000 +0100
-+++ pv-1.1.4/tests/010-opencsw-cksum	2008-12-09 23:46:26.094207757 +0100
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# Transfer a chunk of data through pv and check data correctness
-+# afterwards.
-+
-+# generate some data (10MB)
-+dd if=/dev/urandom of=$TMP1 bs=1024 count=10240 2>/dev/null
-+
-+# read through pv and test afterwards
-+${PROG} -B 100000 -q $TMP1 > $TMP2
-+
-+CKSUM1=`cksum $TMP1 | awk '{ print $1 }`
-+CKSUM2=`cksum $TMP2 | awk '{ print $1 }`
-+
-+test "x$CKSUM1" = "x$CKSUM2"
-+
-+# EOF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list