[csw-devel] SF.net SVN: gar:[7001] csw/mgar/pkg/libpopt/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7001
          http://gar.svn.sourceforge.net/gar/?rev=7001&view=rev
Author:   dmichelsen
Date:     2009-10-29 08:11:46 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
libpopt: Fix failing test

Modified Paths:
--------------
    csw/mgar/pkg/libpopt/trunk/Makefile
    csw/mgar/pkg/libpopt/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch

Modified: csw/mgar/pkg/libpopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpopt/trunk/Makefile	2009-10-28 16:51:57 UTC (rev 7000)
+++ csw/mgar/pkg/libpopt/trunk/Makefile	2009-10-29 08:11:46 UTC (rev 7001)
@@ -17,6 +17,10 @@
 MASTER_SITES = http://rpm5.org/files/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+# This fixes a minor failing check. See for details
+#   http://www.mail-archive.com/popt-devel@rpm5.org/msg00155.html
+PATCHFILES = 0001-Fix-failing-tests.patch
+
 PACKAGES = CSWlibpopt
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/libpopt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpopt/trunk/checksums	2009-10-28 16:51:57 UTC (rev 7000)
+++ csw/mgar/pkg/libpopt/trunk/checksums	2009-10-29 08:11:46 UTC (rev 7001)
@@ -1 +1,2 @@
-c61ef795fa450eb692602a661ec8d7f1  download/popt-1.15.tar.gz
+4999ab4e862297b281b78f2a0ac6ebd5  0001-Fix-failing-tests.patch
+c61ef795fa450eb692602a661ec8d7f1  popt-1.15.tar.gz

Added: csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch
===================================================================
--- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch	                        (rev 0)
+++ csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch	2009-10-29 08:11:46 UTC (rev 7001)
@@ -0,0 +1,34 @@
+From 47be5f0af0829a29d86ad7025648a0309b49ea21 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Oct 2009 09:04:42 +0100
+Subject: [PATCH] Fix failing tests
+
+---
+ testit.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testit.sh b/testit.sh
+index 0a0ba09..4b667b5 100755
+--- a/testit.sh
++++ b/testit.sh
+@@ -111,7 +111,7 @@ run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
+ run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
+ 
+ run test1 "test1 - 55" "\
+-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
++Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
+         [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
+         [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
+@@ -120,7 +120,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+         [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+ 
+ run test1 "test1 - 56" "\
+-Usage: lt-test1 [OPTION...]
++Usage: test1 [OPTION...]
+       --arg1                      First argument with a really long
+                                   description. After all, we have to test
+                                   argument help wrapping somehow, right?
+-- 
+1.6.5
+


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