summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2016-03-30 18:47:18 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2016-03-30 18:47:18 -0500
commit6bb3f7f2fa49d1e0318a9032eab75a27a4a2b141 (patch)
tree63a9df9f53394c898aeba737f691ee047cfcd532
parentdab2c2ef2f61248973df4fa1ae8c9854cc1d73a3 (diff)
downloadcygwin-libiconv-6bb3f7f2fa49d1e0318a9032eab75a27a4a2b141.tar.gz
cygwin-libiconv-6bb3f7f2fa49d1e0318a9032eab75a27a4a2b141.tar.xz
cygwin-libiconv-6bb3f7f2fa49d1e0318a9032eab75a27a4a2b141.zip
Fix build on EL6
-rw-r--r--cygwin-libiconv.spec10
1 files changed, 7 insertions, 3 deletions
diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec
index 515702d..20715e1 100644
--- a/cygwin-libiconv.spec
+++ b/cygwin-libiconv.spec
@@ -2,7 +2,7 @@
Name: cygwin-libiconv
Version: 1.14
-Release: 4
+Release: 5%{?dist}
Summary: GNU libraries and utilities for character set conversion
License: GPLv2+ and LGPLv2+
@@ -24,7 +24,7 @@ BuildRequires: cygwin64-gcc
BuildRequires: cygwin64-binutils
BuildRequires: cygwin64
-BuildRequires: autoconf, automake, libtool, gettext-devel
+BuildRequires: autoconf, automake, cygwin-libtool-base, gettext-devel
# There's a quasi-circular dependency between cygwin-libiconv and
# cygwin-gettext. If gettext is installed when you build this then
@@ -78,7 +78,7 @@ Static version of Iconv library for Cygwin x86_64 toolchain.
rm -f m4/libtool.m4 m4/lt*.m4
%patch0 -p2
%patch1 -p2
-autoreconf -f -i -v -I `pwd`/m4 -I `pwd`/srcm4
+%cygwin_autoreconf -I `pwd`/m4 -I `pwd`/srcm4
%build
@@ -144,6 +144,9 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias
%changelog
+* Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.14-5
+- Fix build on EL6
+
* Fri Jul 25 2014 Yaakov Selkowitz <yselkowitz@cygwin.com> - 1.14-4
- Cleanup spec
@@ -159,3 +162,4 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias
* Wed Feb 16 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.13.1-1
- Initial RPM release, largely based on mingw32-iconv.
+