OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 01-Apr-2009 07:30:12
Branch: HEAD Handle: 2009040106301100
Modified files:
openpkg-src/libiconv libiconv.patch libiconv.spec
Log:
upgrading package: libiconv 1.12 -> 1.13
Summary:
Revision Changes Path
1.3 +41 -5 openpkg-src/libiconv/libiconv.patch
1.49 +2 -6 openpkg-src/libiconv/libiconv.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libiconv/libiconv.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 libiconv.patch
--- openpkg-src/libiconv/libiconv.patch 12 Nov 2007 07:45:55 -0000
1.2
+++ openpkg-src/libiconv/libiconv.patch 1 Apr 2009 05:30:11 -0000
1.3
@@ -1,7 +1,43 @@
+Index: configure
+--- configure.orig 2009-03-26 13:10:59 +0100
++++ configure 2009-03-31 21:00:49 +0200
+@@ -4240,13 +4240,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ :
+ fi
+
+ ac_ext=c
+Index: libcharset/configure
+--- libcharset/configure.orig 2009-03-26 13:11:20 +0100
++++ libcharset/configure 2009-03-31 21:01:20 +0200
+@@ -3199,13 +3199,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ :
+ fi
+
+ ac_ext=c
Index: src/Makefile.in
---- src/Makefile.in.orig 2007-05-28 00:15:52 +0200
-+++ src/Makefile.in 2007-11-12 08:42:45 +0100
-@@ -102,11 +102,7 @@
+--- src/Makefile.in.orig 2009-01-17 10:00:59 +0100
++++ src/Makefile.in 2009-03-31 20:45:48 +0200
+@@ -111,11 +111,7 @@
# ../lib/libiconv.la entirely.
install : all force
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
@@ -12,5 +48,5 @@
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv
$(DESTDIR)$(bindir)/iconv
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM)
iconv_no_i18n $(DESTDIR)$(bindir)/iconv
- installdirs : force
- if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs)
$(DESTDIR)$(bindir) ; fi
+ install-strip : force
+ case '$(INSTALL_PROGRAM)' in \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libiconv/libiconv.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 libiconv.spec
--- openpkg-src/libiconv/libiconv.spec 1 Jan 2008 14:56:59 -0000
1.48
+++ openpkg-src/libiconv/libiconv.spec 1 Apr 2009 05:30:11 -0000
1.49
@@ -31,8 +31,8 @@
Class: BASE
Group: Charset
License: LGPL
-Version: 1.12
-Release: 20080101
+Version: 1.13
+Release: 20090401
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz
@@ -59,10 +59,6 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst \
- -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
- libcharset/configure \
- configure
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
