Added termcap, and some more macros to the base package.

diff --git a/.hgignore b/.hgignore
index 0f05dfb..bc848b2 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -40,8 +40,10 @@ pdcurses/PDCurses-3.4.tar.gz
 pixman/pixman-0.11.10.tar.gz
 pixman/pixman-0.12.0.tar.gz
 portablexdr/portablexdr-4.0.10.tar.gz
+readline/readline-5.2.tar.gz
 runtime-bootstrap/mingw-runtime-3.14.tar.gz
 runtime/mingw-runtime-3.14-src.tar.gz
+termcap/termcap-1.3.1.tar.gz
 w32api-bootstrap/w32api-3.11.tar.gz
 w32api/w32api-3.11-src.tar.gz
 zlib/zlib-1.2.3.tar.gz

diff --git a/filesystem/mingw32-filesystem.spec b/filesystem/mingw32-filesystem.spec
index f7825ca..1426f9a 100644 (file)
--- a/filesystem/mingw32-filesystem.spec
+++ b/filesystem/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        27
+Version:        29
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 29-1
+- Added _mingw32_as, _mingw32_dlltool, _mingw32_windres.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 27-1
 - Begin the grand renaming of mingw -> mingw32.
 - Added mingw32(mscoree.dll).

diff --git a/filesystem/mingw32-macros.mingw32 b/filesystem/mingw32-macros.mingw32
index 0d0b0bd..e5d9368 100644 (file)
--- a/filesystem/mingw32-macros.mingw32
+++ b/filesystem/mingw32-macros.mingw32
@@ -26,9 +26,12 @@
 %_mingw32_cc             i686-pc-mingw32-gcc
 %_mingw32_cpp            i686-pc-mingw32-gcc -E
 %_mingw32_ar             i686-pc-mingw32-ar
+%_mingw32_as             i686-pc-mingw32-as
+%_mingw32_dlltool        i686-pc-mingw32-dlltool
 %_mingw32_ranlib         i686-pc-mingw32-ranlib
 %_mingw32_strip                  i686-pc-mingw32-strip
 %_mingw32_objdump        i686-pc-mingw32-objdump
+%_mingw32_windres        i686-pc-mingw32-windres
 %_mingw32_findprovides    /usr/lib/rpm/mingw32-find-provides.sh
 %_mingw32_findrequires    /usr/lib/rpm/mingw32-find-requires.sh
 

diff --git a/termcap/mingw32-termcap.spec b/termcap/mingw32-termcap.spec
new file mode 100644 (file)
index 0000000..a62f529
--- /dev/null
+++ b/termcap/mingw32-termcap.spec
@@ -0,0 +1,90 @@
+# Note: Termcap was deprecated and removed from Fedora after F-8.  It
+# has been replaced by ncurses.  However ncurses cannot be compiled on
+# Windows so we have to supply termcap.  In addition, the last stand-
+# alone Fedora termcap package was actually just /etc/termcap from
+# ncurses.  So here we are using the GNU termcap library which is
+# regretably GPL'd.
+
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
+
+Name:           mingw32-termcap
+Version:        1.3.1
+Release:        1%{?dist}
+Summary:        MinGW terminal feature database
+
+License:        GPLv2+
+Group:          Development/Libraries
+URL:            ftp://ftp.gnu.org/gnu/termcap/
+Source0:        ftp://ftp.gnu.org/gnu/termcap/termcap-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+
+BuildRequires:  mingw32-filesystem >= 28
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+
+
+%description
+This is the GNU termcap library -- a library of C functions that
+enable programs to send control strings to terminals in a way
+independent of the terminal type.  The GNU termcap library does not
+place an arbitrary limit on the size of termcap entries, unlike most
+other termcap libraries.
+
+This package contains libraries and development tools for the MinGW
+cross-compiled version.
+
+
+%prep
+%setup -q -n termcap-%{version}
+
+
+%build
+%{_mingw32_configure}
+make
+
+# Build a shared library.  No need for -fPIC on Windows.
+%{_mingw32_cc} -shared -Wl,--out-implib,termcap.dll.a -o termcap.dll \
+  termcap.o tparam.o version.o
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install \
+  prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} \
+  oldincludedir=
+
+# Move the shared library to the correct locations.
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
+mv termcap.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+mv termcap.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+
+# Don't want the static library, thank you.
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libtermcap.a
+
+# Move the info files to the correct location.
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_infodir}
+mv $RPM_BUILD_ROOT%{_mingw32_prefix}/info/* $RPM_BUILD_ROOT%{_mingw32_infodir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{_mingw32_bindir}/termcap.dll
+%{_mingw32_libdir}/termcap.dll.a
+%{_mingw32_infodir}/*
+%{_mingw32_includedir}/termcap.h
+
+
+%changelog
+* Thu Sep 25 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
+- Initial RPM release.