浏览代码

upgrading package: libiconv 1.9.2 -> 1.10

Ralf S. Engelschall 20 年之前
父节点
当前提交
7bc8b89c85
共有 2 个文件被更改,包括 21 次插入6 次删除
  1. 16 0
      libiconv/libiconv.patch
  2. 5 6
      libiconv/libiconv.spec

+ 16 - 0
libiconv/libiconv.patch

@@ -0,0 +1,16 @@
+Index: src/Makefile.in
+--- src/Makefile.in.orig	2005-06-09 21:04:50 +0200
++++ src/Makefile.in	2005-07-27 09:30:39 +0200
+@@ -90,11 +90,7 @@
+ 	if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
+ 	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+-	case "@host_os@" in \
+-	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+-	esac
+-	$(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)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi

+ 5 - 6
libiconv/libiconv.spec

@@ -32,11 +32,12 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Converter
 License:      LGPL
-Version:      1.9.2
-Release:      20041022
+Version:      1.10
+Release:      20050727
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz
+Patch0:       libiconv.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -58,10 +59,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    #   use library in build directory
-    %{l_shtool} subst \
-        -e 's;-L\$(libdir);-L$(DESTDIR)$(libdir);' \
-        src/Makefile.in
+    %patch -p0
     %{l_shtool} subst \
         -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
         libcharset/configure \
@@ -73,6 +71,7 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
+        --disable-nls \
         --disable-shared \
         --enable-static
     %{l_make} %{l_mflags}