Update to latest patch release

- Build for both Cygwin targets

1 files changed, 102 insertions, 56 deletions

diff --git a/cygwin-ncurses.spec b/cygwin-ncurses.spec
index 02bf712..8458cd7 100644
--- a/cygwin-ncurses.spec
+++ b/cygwin-ncurses.spec
@@ -1,11 +1,10 @@
 %{?cygwin_package_header}
 
-# built separately due to mismatched versions
-%global cygwin_build_64bit 0
+%global patch 20140524
 
 Name:      cygwin-ncurses
-Version:   5.7
-Release:   2
+Version:   5.9
+Release:   2.%{patch}
 Summary:   Ncurses library for Cygwin toolchain
 
 Group:     Development/Libraries
@@ -13,18 +12,8 @@ License:   MIT
 URL:       http://invisible-island.net/ncurses/
 BuildArch: noarch
 
-Source0:   ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
-Patch0:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091107-patch.sh.bz2
-Patch1:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091114.patch.gz
-Patch2:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091121.patch.gz
-Patch3:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091128.patch.gz
-Patch4:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091205.patch.gz
-Patch5:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091212.patch.gz
-Patch6:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091219.patch.gz
-Patch7:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091226.patch.gz
-Patch8:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20091227.patch.gz
-Patch100:  ncurses-5.7-17.extra.patch
-Patch101:  ncurses-5.7-18.src.patch
+Source0:   ftp://invisible-island.net/ncurses/current/ncurses-%{version}-%{patch}.tgz
+Patch100:  ncurses-5.9-abi-version.patch
 
 BuildRequires: cygwin32-filesystem
 BuildRequires: cygwin32-binutils
@@ -33,12 +22,19 @@ BuildRequires: cygwin32-gcc-c++
 BuildRequires: cygwin32-libtool
 BuildRequires: cygwin32
 
+BuildRequires: cygwin64-filesystem
+BuildRequires: cygwin64-binutils
+BuildRequires: cygwin64-gcc
+BuildRequires: cygwin64-gcc-c++
+BuildRequires: cygwin64-libtool
+BuildRequires: cygwin64
+
 
 %description
 Ncurses library for Cygwin toolchains
 
 %package -n cygwin32-ncurses
-Summary:   Ncurses library for Cygwin toolchain
+Summary:   Ncurses library for Cygwin32 toolchain
 Group:     Development/Libraries
 Provides:  %{name} = %{version}-%{release}
 Obsoletes: %{name} < %{version}-%{release}
@@ -46,29 +42,28 @@ Obsoletes: %{name} < %{version}-%{release}
 %description -n cygwin32-ncurses
 Ncurses library for Cygwin i686 toolchain
 
+%package -n cygwin64-ncurses
+Summary:   Ncurses library for Cygwin64 toolchain
+Group:     Development/Libraries
+
+%description -n cygwin64-ncurses
+Ncurses library for Cygwin x86_64 toolchain
+
 %{?cygwin_debug_package}
 
 
 %prep
-%setup -q -n ncurses-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%setup -q -n ncurses-%{version}-%{patch}
 %patch100 -p2
-%patch101 -p2
 
 
 %build
-%cygwin32_configure \
+CYGWIN32_CONFIGURE_ARGS="--with-libtool=%{_bindir}/%{cygwin32_target}-libtool \
+	--with-pkg-config-libdir=%{cygwin32_libdir}/pkgconfig"
+CYGWIN64_CONFIGURE_ARGS="--with-libtool=%{_bindir}/%{cygwin64_target}-libtool \
+	--with-pkg-config-libdir=%{cygwin64_libdir}/pkgconfig"
+%cygwin_configure \
 	--with-build-cflags=-D_XOPEN_SOURCE_EXTENDED \
-	--with-libtool=%{_bindir}/%{cygwin32_target}-libtool \
-        PKG_CONFIG_LIBDIR=%{cygwin32_libdir}/pkgconfig \
 	--with-install-prefix=$RPM_BUILD_ROOT \
 	--without-debug --disable-relink --disable-rpath \
 	--with-ticlib --without-termlib --enable-widec --enable-ext-colors \
@@ -76,42 +71,50 @@ Ncurses library for Cygwin i686 toolchain
 	--with-abi-version=10 --with-wrap-prefix=ncwrap_ \
 	--enable-sigwinch --enable-colorfgbg --enable-tcap-names \
 	--disable-termcap --disable-mixed-case --enable-symlinks \
-	--with-pkg-config --enable-pc-files \
+	--with-pkg-config --enable-pc-files --enable-overwrite \
 	--with-manpage-format=normal --with-manpage-aliases \
 	--with-default-terminfo-dir=/usr/share/terminfo \
 	--enable-echo
 
-sed -i -e 's%^\(LIBRARIES[ \t]*=\).*$%\1 ../lib/libncursesw.la ../lib/libticw.la%' ncurses/Makefile
-make
+sed -i -e 's%^\(LIBRARIES[ \t]*=\).*$%\1 ../lib/libncursesw.la ../lib/libticw.la%' build_*/ncurses/Makefile
+%cygwin_make
 
 
 %install
-make install.libs install.includes DESTDIR=$RPM_BUILD_ROOT
-
-pushd $RPM_BUILD_ROOT%{cygwin32_bindir}
-mv ncursesw10-config ncursesw5-config
-ln -s ncursesw5-config ncurses5-config
-sed -i -e 's|echo "10"|echo "6"|' ncursesw5-config
-popd
-
-mkdir -p $RPM_BUILD_ROOT%{cygwin32_includedir}/ncurses{,w}
-pushd $RPM_BUILD_ROOT%{cygwin32_includedir}/ncurses
-ln -s ../*.h .
-popd
-pushd $RPM_BUILD_ROOT%{cygwin32_includedir}/ncursesw
-ln -s ../*.h .
-popd
-
-pushd $RPM_BUILD_ROOT%{cygwin32_libdir}
-for f in *.a
+%cygwin_make install.libs install.includes DESTDIR=$RPM_BUILD_ROOT
+
+for d in %{cygwin32_bindir} %{cygwin64_bindir}
 do
-  ln -s ${f} ${f/w/}
+	pushd $RPM_BUILD_ROOT$d
+	mv ncursesw10-config ncursesw5-config
+	ln -s ncursesw5-config ncurses5-config
+	sed -i -e 's|echo "10"|echo "6"|' ncursesw5-config
+	popd
 done
 
-pushd $RPM_BUILD_ROOT%{cygwin32_libdir}/pkgconfig
-for f in *.pc
+for d in %{cygwin32_includedir}/ncurses{,w} %{cygwin64_includedir}/ncurses{,w}
 do
-  ln -s ${f} ${f/w/}
+	mkdir -p $RPM_BUILD_ROOT$d
+	pushd $RPM_BUILD_ROOT$d
+	ln -s ../*.h .
+	popd
+done
+
+for d in %{cygwin32_libdir} %{cygwin64_libdir}
+do
+	pushd $RPM_BUILD_ROOT$d
+	for f in *.a
+	do
+		ln -s ${f} ${f/w/}
+	done
+	popd
+
+	pushd $RPM_BUILD_ROOT$d/pkgconfig
+	for f in *.pc
+	do
+		ln -s ${f} ${f/w/}
+	done
+	popd
 done
 
 # We intentionally don't ship *.la files
@@ -156,11 +159,54 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %{cygwin32_libdir}/pkgconfig/tic.pc
 %{cygwin32_libdir}/pkgconfig/ticw.pc
 
+%files -n cygwin64-ncurses
+%doc ANNOUNCE AUTHORS NEWS README
+%{cygwin64_bindir}/cygformw-10.dll
+%{cygwin64_bindir}/cygmenuw-10.dll
+%{cygwin64_bindir}/cygncursesw-10.dll
+%{cygwin64_bindir}/cygncurses++w-10.dll
+%{cygwin64_bindir}/cygpanelw-10.dll
+%{cygwin64_bindir}/cygticw-10.dll
+%{cygwin64_bindir}/ncurses5-config
+%{cygwin64_bindir}/ncursesw5-config
+%{cygwin64_includedir}/*.h
+%{cygwin64_includedir}/ncurses/
+%{cygwin64_includedir}/ncursesw/
+%{cygwin64_libdir}/libform.dll.a
+%{cygwin64_libdir}/libformw.dll.a
+%{cygwin64_libdir}/libmenu.dll.a
+%{cygwin64_libdir}/libmenuw.dll.a
+%{cygwin64_libdir}/libncurses.dll.a
+%{cygwin64_libdir}/libncursesw.dll.a
+%{cygwin64_libdir}/libncurses++.dll.a
+%{cygwin64_libdir}/libncurses++w.dll.a
+%{cygwin64_libdir}/libpanel.dll.a
+%{cygwin64_libdir}/libpanelw.dll.a
+%{cygwin64_libdir}/libtic.dll.a
+%{cygwin64_libdir}/libticw.dll.a
+%{cygwin64_libdir}/pkgconfig/form.pc
+%{cygwin64_libdir}/pkgconfig/formw.pc
+%{cygwin64_libdir}/pkgconfig/menu.pc
+%{cygwin64_libdir}/pkgconfig/menuw.pc
+%{cygwin64_libdir}/pkgconfig/ncurses.pc
+%{cygwin64_libdir}/pkgconfig/ncursesw.pc
+%{cygwin64_libdir}/pkgconfig/ncurses++.pc
+%{cygwin64_libdir}/pkgconfig/ncurses++w.pc
+%{cygwin64_libdir}/pkgconfig/panel.pc
+%{cygwin64_libdir}/pkgconfig/panelw.pc
+%{cygwin64_libdir}/pkgconfig/tic.pc
+%{cygwin64_libdir}/pkgconfig/ticw.pc
+
 
 %changelog
+* Mon Jul 01 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 5.9-2.20140524
+- Update to latest patch release
+- Build for both Cygwin targets
+
 * Mon Jul 01 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 5.7-2
 - Rebuild for new Cygwin packaging scheme.
 - Build only widechar libraries.
 
 * Thu Mar 22 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 5.7-1
 - Initial RPM release.
+