Browse Source

requires libiconv; make sure it detects it; make sure it announces it forward to other packages

Ralf S. Engelschall 21 years ago
parent
commit
b3539940fe
2 changed files with 16 additions and 1 deletions
  1. 10 0
      libidn/libidn.patch
  2. 6 1
      libidn/libidn.spec

+ 10 - 0
libidn/libidn.patch

@@ -0,0 +1,10 @@
+Index: libidn.pc.in
+--- libidn.pc.in.orig	2004-04-18 22:37:53 +0200
++++ libidn.pc.in	2004-09-17 16:18:09 +0200
+@@ -17,5 +17,5 @@
+ Name: Libidn
+ Description: IETF stringprep, nameprep, punycode, IDNA text processing.
+ Version: @VERSION@
+-Libs: -L${libdir} -lidn
++Libs: -L${libdir} -lidn @LTLIBICONV@
+ Cflags: -I${includedir}

+ 6 - 1
libidn/libidn.spec

@@ -34,16 +34,19 @@ Class:        EVAL
 Group:        DNS
 License:      LGPL
 Version:      0.5.5
-Release:      20040914
+Release:      20040917
 
 #   list of sources
 Source0:      http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
+Patch0:       libidn.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  libiconv
+PreReq:       libiconv
 AutoReq:      no
 AutoReqProv:  no
 
@@ -74,6 +77,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
     CC="%{l_cc}" \
@@ -83,6 +87,7 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --includedir=%{l_prefix}/include/libidn \
+        --with-libiconv-prefix=%{l_prefix} \
         --disable-shared \
         --disable-nls
     %{l_make} %{l_mflags -O}