diff options
Diffstat (limited to 'cygwin-libiconv.spec')
| -rw-r--r-- | cygwin-libiconv.spec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec index ef45950..c5a3e23 100644 --- a/cygwin-libiconv.spec +++ b/cygwin-libiconv.spec @@ -6,7 +6,7 @@ Name: cygwin-libiconv Version: 1.14 -Release: 1 +Release: 2 Summary: GNU libraries and utilities for character set conversion License: GPLv2+ and LGPLv2+ @@ -17,6 +17,7 @@ BuildArch: noarch Source0: http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz Patch0: libiconv-1.14-wchar.patch +Patch1: libiconv-1.14-reloc.patch BuildRequires: cygwin-filesystem >= 2 BuildRequires: cygwin-gcc @@ -47,6 +48,7 @@ Static version of the Cygwin Iconv library. %setup -q -n libiconv-%{version} rm -f m4/libtool.m4 m4/lt*.m4 %patch0 -p2 +%patch1 -p2 autoreconf -f -i -v -I `pwd`/m4 -I `pwd`/srcm4 @@ -77,6 +79,7 @@ rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la # Remove unnecessary Cygwin native binaries rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/charset.alias %clean @@ -91,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT %{_cygwin_includedir}/iconv.h %{_cygwin_includedir}/libcharset.h %{_cygwin_includedir}/localcharset.h -%{_cygwin_libdir}/charset.alias %{_cygwin_libdir}/libcharset.dll.a %{_cygwin_libdir}/libiconv.dll.a @@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 31 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.14-2 +- Added relocation patch from Cygwin distro. + * Wed Aug 31 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.14-1 - Version bump. |