[mingw-libidn: 8/18] Rebuild in order to have soft dependency on libintl

epienbro epienbro at fedoraproject.org
Wed Mar 7 19:23:00 UTC 2012


commit 305a1485b0dde043d231f252cb8959744ac504b5
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Nov 7 19:22:24 2010 +0100

    Rebuild in order to have soft dependency on libintl

 mingw32-libidn-proxy-libintl-compile-fix.patch |   11 +++++++++++
 mingw32-libidn.spec                            |   11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-libidn-proxy-libintl-compile-fix.patch b/mingw32-libidn-proxy-libintl-compile-fix.patch
new file mode 100644
index 0000000..ddd8247
--- /dev/null
+++ b/mingw32-libidn-proxy-libintl-compile-fix.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2010-10-22 16:52:10.906419074 +0200
++++ configure	2010-10-22 16:52:49.665363924 +0200
+@@ -13246,7 +13246,7 @@
+             done
+           fi
+           if test "X$found_dir" != "X"; then
+-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
++                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -Wl,-l$name"
+             if test "X$found_so" != "X"; then
+                                                         if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
diff --git a/mingw32-libidn.spec b/mingw32-libidn.spec
index b468578..8855ac5 100644
--- a/mingw32-libidn.spec
+++ b/mingw32-libidn.spec
@@ -11,7 +11,7 @@
 
 Name:           mingw32-libidn
 Version:        1.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows Internationalized Domain Name support library
 
 License:        LGPLv2+
@@ -20,6 +20,9 @@ URL:            http://www.gnu.org/software/libidn/
 Source0:        http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Libtool doesn't like proxy-libintl
+Patch0:         mingw32-libidn-proxy-libintl-compile-fix.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -53,6 +56,7 @@ Static version of the MinGW Windows IDN library.
 
 %prep
 %setup -q -n libidn-%{version}
+%patch0 -p0
 
 
 %build
@@ -97,7 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 1.14-5
+* Sun Nov  7 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-6
+- Rebuild in order to have soft dependency on libintl
+
+* Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-5
 - Rebuild because of broken mingw32-gcc/mingw32-binutils
 
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-4


More information about the scm-commits mailing list