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: 14-Jun-2007 22:56:33
Branch: HEAD Handle: 2007061421563201
Modified files:
openpkg-src/popt popt.patch popt.spec
Log:
finally upgrade to the new POPT 1.11 from rpm5.org ;-)
Summary:
Revision Changes Path
1.3 +0 -113 openpkg-src/popt/popt.patch
1.42 +7 -17 openpkg-src/popt/popt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 popt.patch
--- openpkg-src/popt/popt.patch 3 Jun 2007 08:28:55 -0000 1.2
+++ openpkg-src/popt/popt.patch 14 Jun 2007 20:56:32 -0000 1.3
@@ -9,116 +9,3 @@
#ifdef POPT_WCHAR_HACK
#include <wchar.h> /* for mbsrtowcs */
/[EMAIL PROTECTED] mbstate_t @*/
-Index: poptint.c
---- poptint.c.orig 2007-04-25 03:48:42 +0200
-+++ poptint.c 2007-06-03 10:25:13 +0200
-@@ -5,10 +5,6 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <errno.h>
--#include <iconv.h>
--#ifdef HAVE_LANGINFO_H
--#include <langinfo.h>
--#endif
-
- #include "system.h"
- #include "poptint.h"
-@@ -19,76 +15,6 @@
- va_end ((args));
-
- static char *
--strdup_locale_from_utf8 (char *buffer)
--{
-- char *codeset = NULL;
-- char *pout = NULL, *dest_str;
-- iconv_t fd;
-- int ib, ob, dest_size;
-- int done, is_error;
-- size_t err, used;
--
-- if (!buffer)
-- return NULL;
--
--#ifdef HAVE_LANGINFO_H
-- codeset = nl_langinfo (CODESET);
--#endif
--
-- if (codeset &&
-- strcmp (codeset, "UTF-8") &&
-- (fd = iconv_open (codeset, "UTF-8")) != (iconv_t)-1) {
-- char *pin = buffer;
-- char *shift_pin = NULL;
--
-- iconv (fd, NULL, (size_t*)&ib, &pout, (size_t*)&ob);
-- ib = strlen (buffer);
-- dest_size = ob = ib;
-- dest_str = pout = malloc ((dest_size + 1) * sizeof (char));
-- done = is_error = 0;
-- while (!done && !is_error) {
-- err = iconv (fd, (const char**)&pin, (size_t*)&ib, &pout,
(size_t*)&ob);
--
-- if (err == (size_t)-1) {
-- switch (errno) {
-- case EINVAL:
-- done = 1;
-- break;
-- case E2BIG:
-- used = pout - dest_str;
-- dest_size *= 2;
-- dest_str = realloc (dest_str, (dest_size + 1) * sizeof (char));
-- pout = dest_str + used;
-- ob = dest_size - used;
-- break;
-- case EILSEQ:
-- is_error = 1;
-- break;
-- default:
-- is_error = 1;
-- break;
-- }
-- } else {
-- if (!shift_pin) {
-- shift_pin = pin;
-- pin = NULL;
-- ib = 0;
-- } else {
-- done = 1;
-- }
-- }
-- }
-- iconv_close (fd);
-- *pout = '\0';
-- dest_str = strdup (dest_str);
-- } else {
-- dest_str = strdup (buffer);
-- }
--
-- return dest_str;
--}
--
--static char *
- strdup_vprintf (const char *format, va_list ap)
- {
- char *buffer = NULL;
-@@ -118,20 +44,11 @@
- int retval = 0;
- va_list args;
- char *buffer = NULL;
-- char *locale_str = NULL;
-
- va_start (args, format);
- buffer = strdup_vprintf (format, args);
- va_end (args);
--
-- locale_str = strdup_locale_from_utf8 (buffer);
-- if (locale_str) {
-- retval = fprintf (stream, "%s", locale_str);
-- free (locale_str);
-- } else {
-- fprintf (stderr, POPT_WARNING "%s\n", "Invalid UTF-8");
-- retval = fprintf (stream, "%s", buffer);
-- }
-+ retval = fprintf (stream, "%s", buffer);
- free (buffer);
-
- return retval;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 popt.spec
--- openpkg-src/popt/popt.spec 3 Jun 2007 08:28:55 -0000 1.41
+++ openpkg-src/popt/popt.spec 14 Jun 2007 20:56:33 -0000 1.42
@@ -22,11 +22,6 @@
## SUCH DAMAGE.
##
-# package versions
-%define V_rpm_class 4.4.x
-%define V_rpm 4.4.9
-%define V_popt 1.10.9
-
# package information
Name: popt
Summary: Option Parsing Library
@@ -37,11 +32,11 @@
Class: BASE
Group: Libraries
License: LGPL
-Version: %{V_popt}
-Release: 20070603
+Version: 1.11
+Release: 20070614
# list of sources
-Source0:
http://rpm5.org/files/rpm/rpm-%{V_rpm_class}/rpm-%{V_rpm}.tar.gz
+Source0: http://rpm5.org/files/popt/popt-%{version}.tar.gz
Source1: popt.pc
Patch0: popt.patch
@@ -61,19 +56,14 @@
functions for parsing strings into argv[] style arrays, etc.
%track
- prog popt:rpm = {
- version = %{V_rpm}
- url = ftp://jbj.org/pub/rpm-%{V_rpm_class}/
- regex = rpm-(__VER__)\.tar\.gz
- }
- prog popt:popt = {
- version = %{V_popt}
- url = http://rpm5.org/files/rpm/rpm-%{V_rpm_class}/
+ prog popt = {
+ version = %{version}
+ url = http://rpm5.org/files/popt/
regex = popt-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n rpm-%{V_rpm}/popt
+ %setup -q
%patch -p0
%build
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
