diff options
Diffstat (limited to 'cygwin-libiconv.spec')
| -rw-r--r-- | cygwin-libiconv.spec | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec index 20715e1..402c89a 100644 --- a/cygwin-libiconv.spec +++ b/cygwin-libiconv.spec @@ -2,7 +2,7 @@ Name: cygwin-libiconv Version: 1.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GNU libraries and utilities for character set conversion License: GPLv2+ and LGPLv2+ @@ -13,6 +13,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 +Patch2: libiconv-1.14-aliases.patch BuildRequires: cygwin32-filesystem BuildRequires: cygwin32-gcc @@ -39,8 +40,6 @@ Cygwin Iconv library %package -n cygwin32-libiconv Summary: Cygwin32 Iconv library Group: Development/Libraries -Provides: cygwin-libiconv = %{version}-%{release} -Obsoletes: cygwin-libiconv < %{version}-%{release} %description -n cygwin32-libiconv Iconv library for Cygwin i686 toolchain. @@ -49,8 +48,6 @@ Iconv library for Cygwin i686 toolchain. Summary: Static version of the Cygwin Iconv library Group: Development/Libraries Requires: cygwin32-libiconv = %{version}-%{release} -Provides: cygwin-libiconv-static = %{version}-%{release} -Obsoletes: cygwin-libiconv-static < %{version}-%{release} %description -n cygwin32-libiconv-static Static version of Iconv library for Cygwin i686 toolchain. @@ -78,6 +75,7 @@ Static version of Iconv library for Cygwin x86_64 toolchain. rm -f m4/libtool.m4 m4/lt*.m4 %patch0 -p2 %patch1 -p2 +%patch2 -p2 %cygwin_autoreconf -I `pwd`/m4 -I `pwd`/srcm4 @@ -144,6 +142,9 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias %changelog +* Tue Dec 05 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.14-6 +- Add aliases patch + * Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.14-5 - Fix build on EL6 |