Add cygwin64 support

1 files changed, 84 insertions, 35 deletions

diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec
index c5a3e23..750a046 100644
--- a/cygwin-libiconv.spec
+++ b/cygwin-libiconv.spec
@@ -1,12 +1,8 @@
-%global __strip %{_cygwin_strip}
-%global __objdump %{_cygwin_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_cygwin_findrequires}
-%global __find_provides %{_cygwin_findprovides}
+%{cygwin_package_header}
 
 Name:      cygwin-libiconv
 Version:   1.14
-Release:   2
+Release:   3
 Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
@@ -19,9 +15,14 @@ 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
-BuildRequires: cygwin-binutils
+BuildRequires: cygwin32-filesystem
+BuildRequires: cygwin32-gcc
+BuildRequires: cygwin32-binutils
+
+BuildRequires: cygwin64-filesystem
+BuildRequires: cygwin64-gcc
+BuildRequires: cygwin64-binutils
+
 BuildRequires: autoconf, automake, libtool, gettext-devel
 
 # There's a quasi-circular dependency between cygwin-libiconv and
@@ -34,14 +35,41 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
 %description
 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.
+
+%package -n cygwin32-libiconv-static
+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.
+
+%package -n cygwin64-libiconv
+Summary:        Cygwin64 Iconv library
+Group:          Development/Libraries
+
+%description -n cygwin64-libiconv
+Iconv library for Cygwin x86_64 toolchain.
 
-%package static
+%package -n cygwin64-libiconv-static
 Summary:        Static version of the Cygwin Iconv library
-Requires:       %{name} = %{version}-%{release}
 Group:          Development/Libraries
+Requires:       cygwin64-libiconv = %{version}-%{release}
 
-%description static
-Static version of the Cygwin Iconv library.
+%description -n cygwin64-libiconv-static
+Static version of Iconv library for Cygwin x86_64 toolchain.
+
+%{?cygwin_debug_package}
 
 
 %prep
@@ -53,57 +81,78 @@ autoreconf -f -i -v -I `pwd`/m4 -I `pwd`/srcm4
 
 
 %build
-%{_cygwin_configure} \
+%cygwin_configure \
   --enable-static --enable-shared \
   am_cv_proto_iconv_arg1= \
   am_cv_proto_iconv="extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
-make
+%cygwin_make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+%cygwin_make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove documentation which duplicates what is already in
 # Fedora native packages.
-rm -rf $RPM_BUILD_ROOT%{_cygwin_docdir}/libiconv/
-rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir}
+rm -rf $RPM_BUILD_ROOT%{cygwin32_docdir}/libiconv/
+rm -rf $RPM_BUILD_ROOT%{cygwin32_mandir}
+rm -rf $RPM_BUILD_ROOT%{cygwin64_docdir}/libiconv/
+rm -rf $RPM_BUILD_ROOT%{cygwin64_mandir}
 
 # If cygwin-gettext was installed during the build, remove the *.mo
 # files.  If cygwin-gettext wasn't installed then there won't be any.
-rm -rf $RPM_BUILD_ROOT%{_cygwin_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{cygwin32_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{cygwin64_datadir}/locale
 
 # We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # Remove unnecessary Cygwin native binaries
-rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/*.exe
-rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
-%defattr(-,root,root,-)
+%files -n cygwin32-libiconv
+%doc COPYING COPYING.LIB
+%{cygwin32_bindir}/cygcharset-1.dll
+%{cygwin32_bindir}/cygiconv-2.dll
+%{cygwin32_includedir}/iconv.h
+%{cygwin32_includedir}/libcharset.h
+%{cygwin32_includedir}/localcharset.h
+%{cygwin32_libdir}/libcharset.dll.a
+%{cygwin32_libdir}/libiconv.dll.a
+
+%files -n cygwin32-libiconv-static
+%{cygwin32_libdir}/libcharset.a
+%{cygwin32_libdir}/libiconv.a
+
+%files -n cygwin64-libiconv
 %doc COPYING COPYING.LIB
-%{_cygwin_bindir}/cygcharset-1.dll
-%{_cygwin_bindir}/cygiconv-2.dll
-%{_cygwin_includedir}/iconv.h
-%{_cygwin_includedir}/libcharset.h
-%{_cygwin_includedir}/localcharset.h
-%{_cygwin_libdir}/libcharset.dll.a
-%{_cygwin_libdir}/libiconv.dll.a
+%{cygwin64_bindir}/cygcharset-1.dll
+%{cygwin64_bindir}/cygiconv-2.dll
+%{cygwin64_includedir}/iconv.h
+%{cygwin64_includedir}/libcharset.h
+%{cygwin64_includedir}/localcharset.h
+%{cygwin64_libdir}/libcharset.dll.a
+%{cygwin64_libdir}/libiconv.dll.a
 
-%files static
-%defattr(-,root,root,-)
-%{_cygwin_libdir}/libcharset.a
-%{_cygwin_libdir}/libiconv.a
+%files -n cygwin64-libiconv-static
+%{cygwin64_libdir}/libcharset.a
+%{cygwin64_libdir}/libiconv.a
 
 
 %changelog
+* Fri Jun 28 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.14-3
+- Rebuild for new Cygwin packaging scheme.
+- Add cygwin64 support.
+
 * Mon Oct 31 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.14-2
 - Added relocation patch from Cygwin distro.