[mingw-win-iconv] Make sure that the .dll.a import library refers to libiconv.dll instead of iconv.dll

epienbro epienbro at fedoraproject.org
Wed Jul 6 20:15:48 UTC 2011


commit 0317f70d1a746630e1689eb7e4170dbb55c2848e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jul 6 22:15:30 2011 +0200

    Make sure that the .dll.a import library refers to libiconv.dll instead of iconv.dll

 mingw-win-iconv.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/mingw-win-iconv.spec b/mingw-win-iconv.spec
index 7ef72d2..f50f778 100644
--- a/mingw-win-iconv.spec
+++ b/mingw-win-iconv.spec
@@ -4,7 +4,7 @@
 
 Name:      mingw-win-iconv
 Version:   0.0.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Iconv implementation using Win32 API
 
 License:   Public Domain
@@ -57,6 +57,10 @@ dos2unix ChangeLog
 chmod -x readme.txt
 chmod -x ChangeLog
 
+# Make sure that the .dll.a import library doesn't refer to a dll named 
+# iconv.dll (as the library generated by cmake is named libiconv.dll)
+sed -i s/'LIBRARY ICONV.DLL'// iconv.def
+
 
 %build
 %{_mingw32_cmake} -DBUILD_STATIC=1
@@ -79,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
 
 
 %changelog
+* Wed Jul  6 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.0.3-3
+- Make sure that the .dll.a import library refers to libiconv.dll
+  instead of iconv.dll
+
 * Sun Jul  3 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.0.3-2
 - Add versioned BR for cmake >= 2.8.0
 


More information about the scm-commits mailing list