From b40f98132763934a242c123f613f1df44aed01a6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] termcap: Rename the library as libtermcap-0.dll for compatibility with gettext. gettext: Add patch to allow building with newer mingw32-runtime package. Rebuild dependent libraries. --- ...mingw32-gettext-0.17-gnulib-optarg-symbols.patch | 14 ++++++++++++++ gettext/mingw32-gettext.spec | 18 ++++++++++++++++-- libvirt/mingw32-libvirt.spec | 6 +++++- readline/mingw32-readline.spec | 7 +++++-- sqlite/mingw32-sqlite.spec | 6 +++++- termcap/mingw32-termcap.spec | 21 ++++++++++++++------- 6 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 gettext/mingw32-gettext-0.17-gnulib-optarg-symbols.patch diff --git a/gettext/mingw32-gettext-0.17-gnulib-optarg-symbols.patch b/gettext/mingw32-gettext-0.17-gnulib-optarg-symbols.patch new file mode 100644 index 0000000..f7063c4 --- /dev/null +++ b/gettext/mingw32-gettext-0.17-gnulib-optarg-symbols.patch @@ -0,0 +1,14 @@ +See https://bugzilla.redhat.com/show_bug.cgi?id=467398#c3 + +--- ./gettext-tools/woe32dll/gettextlib-exports.c.lfarkas 2008-10-31 11:42:38.000000000 +0100 ++++ ./gettext-tools/woe32dll/gettextlib-exports.c 2008-10-31 11:43:29.000000000 +0100 +@@ -26,7 +26,7 @@ + VARIABLE(gl_array_list_implementation) + VARIABLE(gl_linkedhash_list_implementation) + VARIABLE(program_name) +-VARIABLE(rpl_optarg) +-VARIABLE(rpl_optind) ++/*VARIABLE(rpl_optarg) ++VARIABLE(rpl_optind)*/ + VARIABLE(simple_backup_suffix) + VARIABLE(styled_ostream_typeinfo) diff --git a/gettext/mingw32-gettext.spec b/gettext/mingw32-gettext.spec index a4397a0..a933e2d 100644 --- a/gettext/mingw32-gettext.spec +++ b/gettext/mingw32-gettext.spec @@ -6,30 +6,38 @@ Name: mingw32-gettext Version: 0.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GNU libraries and utilities for producing multi-lingual messages License: GPLv2+ and LGPLv2+ Group: Development/Libraries URL: http://www.gnu.org/software/gettext/ Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch0: mingw32-gettext-0.17-gnulib-optarg-symbols.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw32-runtime >= 3.15.1 BuildRequires: mingw32-gcc BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-binutils BuildRequires: mingw32-iconv +BuildRequires: mingw32-termcap >= 1.3.1-3 %description MinGW Windows Gettext library + %prep %setup -q -n gettext-%{version} +%patch0 -p1 + + %build %{_mingw32_configure} \ --disable-java \ @@ -40,6 +48,7 @@ MinGW Windows Gettext library make + %install rm -rf $RPM_BUILD_ROOT @@ -57,6 +66,7 @@ rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libintl.a %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %{_mingw32_bindir}/autopoint @@ -128,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 31 2008 Richard W.M. Jones - 0.17-6 +- Add fix for undefined Gnulib symbols (Farkas Levente). +- Rebuild against mingw32-termcap / libtermcap. + * Wed Sep 24 2008 Richard W.M. Jones - 0.17-5 - Rename mingw -> mingw32. diff --git a/libvirt/mingw32-libvirt.spec b/libvirt/mingw32-libvirt.spec index 2b49baf..a21ee7b 100644 --- a/libvirt/mingw32-libvirt.spec +++ b/libvirt/mingw32-libvirt.spec @@ -6,7 +6,7 @@ Name: mingw32-libvirt Version: 0.4.6 -Release: 7%{?dist}%{?extra_release} +Release: 8%{?dist}%{?extra_release} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ @@ -35,6 +35,7 @@ BuildRequires: mingw32-libxml2 # Portable XDR <= 4.0.10 contains a serious endianness bug on Windows. BuildRequires: mingw32-portablexdr >= 4.0.11 BuildRequires: mingw32-readline +BuildRequires: mingw32-termcap >= 1.3.1-3 BuildRequires: pkgconfig # Need native version for msgfmt @@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 31 2008 Richard Jones - 0.4.6-8 +- Rebuild against latest termcap. + * Thu Oct 16 2008 Richard Jones - 0.4.6-7 - Windows icon patch from https://www.redhat.com/archives/libvir-list/2008-October/msg00331.html diff --git a/readline/mingw32-readline.spec b/readline/mingw32-readline.spec index 1449019..e9c1626 100644 --- a/readline/mingw32-readline.spec +++ b/readline/mingw32-readline.spec @@ -6,7 +6,7 @@ Name: mingw32-readline Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW port of readline for editing typed command lines License: GPLv2+ @@ -34,7 +34,7 @@ BuildArch: noarch BuildRequires: mingw32-filesystem >= 29 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils -BuildRequires: mingw32-termcap +BuildRequires: mingw32-termcap >= 1.3.1-3 %description @@ -119,5 +119,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 31 2008 Richard W.M. Jones - 5.2-2 +- Rebuild against latest termcap. + * Thu Sep 25 2008 Richard W.M. Jones - 5.2-1 - Initial RPM release. diff --git a/sqlite/mingw32-sqlite.spec b/sqlite/mingw32-sqlite.spec index 1eed6ef..fc8f5f8 100644 --- a/sqlite/mingw32-sqlite.spec +++ b/sqlite/mingw32-sqlite.spec @@ -6,7 +6,7 @@ Name: mingw32-sqlite Version: 3.5.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows port of sqlite embeddable SQL database engine License: Public Domain @@ -26,6 +26,7 @@ BuildRequires: mingw32-binutils BuildRequires: mingw32-pdcurses BuildRequires: mingw32-readline +BuildRequires: mingw32-termcap >= 1.3.1-3 BuildRequires: autoconf BuildRequires: libtool @@ -96,5 +97,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 31 2008 Richard Jones - 3.5.9-2 +- Rebuild against latest termcap. + * Thu Sep 25 2008 Richard Jones - 3.5.9-1 - Initial RPM release. diff --git a/termcap/mingw32-termcap.spec b/termcap/mingw32-termcap.spec index a62f529..cacd74c 100644 --- a/termcap/mingw32-termcap.spec +++ b/termcap/mingw32-termcap.spec @@ -13,7 +13,7 @@ Name: mingw32-termcap Version: 1.3.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: MinGW terminal feature database License: GPLv2+ @@ -49,7 +49,9 @@ cross-compiled version. make # Build a shared library. No need for -fPIC on Windows. -%{_mingw32_cc} -shared -Wl,--out-implib,termcap.dll.a -o termcap.dll \ +%{_mingw32_cc} -shared \ + -Wl,--out-implib,libtermcap.dll.a \ + -o libtermcap-0.dll \ termcap.o tparam.o version.o @@ -62,8 +64,8 @@ make install \ # 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} +install -m 0755 libtermcap-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir} +install -m 0755 libtermcap.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir} # Don't want the static library, thank you. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libtermcap.a @@ -79,12 +81,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_mingw32_bindir}/termcap.dll -%{_mingw32_libdir}/termcap.dll.a -%{_mingw32_infodir}/* +%{_mingw32_bindir}/libtermcap-0.dll +%{_mingw32_libdir}/libtermcap.dll.a %{_mingw32_includedir}/termcap.h +# Note that we want the info files in this package because +# there is no equivalent native Fedora package. +%{_mingw32_infodir}/* %changelog +* Fri Oct 31 2008 Richard W.M. Jones - 1.3.1-3 +- Fix so it builds a working DLL. + * Thu Sep 25 2008 Richard W.M. Jones - 1.3.1-1 - Initial RPM release. -- 1.8.3.1