[csw-devel] SF.net SVN: gar:[13342] csw/mgar/pkg/libpopt/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Feb 16 18:41:17 CET 2011
Revision: 13342
http://gar.svn.sourceforge.net/gar/?rev=13342&view=rev
Author: dmichelsen
Date: 2011-02-16 17:41:16 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
libpopt: Update to 1.16 and split packages
Modified Paths:
--------------
csw/mgar/pkg/libpopt/trunk/Makefile
csw/mgar/pkg/libpopt/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libpopt/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
csw/mgar/pkg/libpopt/trunk/files/0002-Fix-failing-tests.patch
Removed 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 2011-02-16 17:39:21 UTC (rev 13341)
+++ csw/mgar/pkg/libpopt/trunk/Makefile 2011-02-16 17:41:16 UTC (rev 13342)
@@ -1,5 +1,5 @@
NAME = popt
-VERSION = 1.15
+VERSION = 1.16
CATEGORIES = lib
DESCRIPTION = Popt is a C library for parsing command line parameters
@@ -17,12 +17,33 @@
MASTER_SITES = http://rpm5.org/files/$(NAME)/
DISTFILES = $(NAME)-$(VERSION).tar.gz
+# This patch has been sent upstream:
+# http://www.mail-archive.com/popt-devel@rpm5.org/
+PATCHFILES += 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
+
# 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
+PATCHFILES += 0002-Fix-failing-tests.patch
-PACKAGES = CSWlibpopt
+PACKAGES += CSWlibpopt
+CATALOGNAME_CSWlibpopt = libpopt
+SPKG_DESC_CSWlibpopt = Transitional package as contents moved to CSWlibpopt0
+PKGFILES_CSWlibpopt = NOFILES
+ARCHALL_CSWlibpopt = 1
+RUNTIME_DEP_PKGS_CSWlibpopt = CSWlibpopt0
+CHECKPKG_OVERRIDES_CSWlibpopt += surplus-dependency|CSWlibpopt0
+PACKAGES += CSWlibpopt0
+CATALOGNAME_CSWlibpopt0 = libpopt0
+SPKG_DESC_CSWlibpopt0 = Library for parsing command line parameters providing libpopt.so.0
+# PKGFILES_CSWlibpopt0 = $(call baseisadirs,$(libdir),libpopt\.so\.0(\.\d+)*)
+
+PACKAGES += CSWlibpopt-dev
+CATALOGNAME_CSWlibpopt-dev = libpopt_dev
+SPKG_DESC_CSWlibpopt-dev = Development files for libpopt.so
+RUNTIME_DEP_PKGS_CSWlibpopt-dev = CSWlibpopt0
+PKGFILES_CSWlibpopt-dev = $(PKGFILES_DEVEL)
+
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv
Modified: csw/mgar/pkg/libpopt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpopt/trunk/checksums 2011-02-16 17:39:21 UTC (rev 13341)
+++ csw/mgar/pkg/libpopt/trunk/checksums 2011-02-16 17:41:16 UTC (rev 13342)
@@ -1,2 +1 @@
-4999ab4e862297b281b78f2a0ac6ebd5 0001-Fix-failing-tests.patch
-c61ef795fa450eb692602a661ec8d7f1 popt-1.15.tar.gz
+3743beefa3dd6247a73f8f7a32c14c33 popt-1.16.tar.gz
Deleted: csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch
===================================================================
--- csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch 2011-02-16 17:39:21 UTC (rev 13341)
+++ csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch 2011-02-16 17:41:16 UTC (rev 13342)
@@ -1,34 +0,0 @@
-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
-
Added: csw/mgar/pkg/libpopt/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/libpopt/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch (rev 0)
+++ csw/mgar/pkg/libpopt/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-02-16 17:41:16 UTC (rev 13342)
@@ -0,0 +1,49 @@
+From bcae71d2d7d6d59a315f36afecacf0acf2c71354 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 16 Feb 2011 18:25:39 +0100
+Subject: [PATCH 1/2] Use inttypes.h if stdint.h is not available
+
+---
+ lookup3.c | 6 ++++++
+ poptint.h | 6 ++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/lookup3.c b/lookup3.c
+index 0584c39..d3a1389 100644
+--- a/lookup3.c
++++ b/lookup3.c
+@@ -34,7 +34,13 @@
+ */
+ /* -------------------------------------------------------------------- */
+
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#else
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#endif
+
+ #if defined(_JLU3_SELFTEST)
+ # define _JLU3_jlu32w 1
+diff --git a/poptint.h b/poptint.h
+index 80cbaca..f4b2716 100644
+--- a/poptint.h
++++ b/poptint.h
+@@ -9,7 +9,13 @@
+ #ifndef H_POPTINT
+ #define H_POPTINT
+
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#else
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#endif
+
+ /**
+ * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
+--
+1.7.3.2
+
Copied: csw/mgar/pkg/libpopt/trunk/files/0002-Fix-failing-tests.patch (from rev 13327, csw/mgar/pkg/libpopt/trunk/files/0001-Fix-failing-tests.patch)
===================================================================
--- csw/mgar/pkg/libpopt/trunk/files/0002-Fix-failing-tests.patch (rev 0)
+++ csw/mgar/pkg/libpopt/trunk/files/0002-Fix-failing-tests.patch 2011-02-16 17:41:16 UTC (rev 13342)
@@ -0,0 +1,34 @@
+From 47102dced1cdfd9ab118bf84c95abea44eae8172 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 16 Feb 2011 18:26:36 +0100
+Subject: [PATCH 2/2] Fix failing tests
+
+---
+ testit.sh | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testit.sh b/testit.sh
+index 2a7b4aa..2779f7c 100755
+--- a/testit.sh
++++ b/testit.sh
+@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
+ run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
+
+ run test1 "test1 - 58" "\
+-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] [-s|--short=SHORT] [-l|--long=LONG]
+ [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
+@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+ [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
+ [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+ run test1 "test1 - 59" "\
+-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.7.3.2
+
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