Rename implibs as lib*.dll.a for compatibility with libtool

diff --git a/libvirt/mingw32-libvirt.spec b/libvirt/mingw32-libvirt.spec
index a21ee7b..b3ae697 100644 (file)
--- a/libvirt/mingw32-libvirt.spec
+++ b/libvirt/mingw32-libvirt.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libvirt
 Version:        0.4.6
-Release:        8%{?dist}%{?extra_release}
+Release:        9%{?dist}%{?extra_release}
 Summary:        MinGW Windows libvirt virtualization library
 
 License:        LGPLv2+
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 22 2008 Richard Jones <rjones@redhat.com> - 0.4.6-9
+- Rebuild against new readline.
+
 * Fri Oct 31 2008 Richard Jones <rjones@redhat.com> - 0.4.6-8
 - Rebuild against latest termcap.
 

diff --git a/ocaml-curses/mingw32-ocaml-curses.spec b/ocaml-curses/mingw32-ocaml-curses.spec
index a6cba4e..6a68552 100644 (file)
--- a/ocaml-curses/mingw32-ocaml-curses.spec
+++ b/ocaml-curses/mingw32-ocaml-curses.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-curses
 Version:        1.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows OCaml bindings for ncurses
 
 License:        LGPLv2+
@@ -60,7 +60,7 @@ make all opt \
   -o test.opt \
   curses.cmxa \
   test.ml \
-  -cclib "-L%{_mingw32_libdir} pdcurses.dll.a"
+  -cclib "-lpdcurses"
 
 
 %install
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 22 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-3
+- Rebuild against new pdcurses.
+
 * Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-2
 - Runtime requires PDCurses library.
 

diff --git a/pdcurses/mingw32-pdcurses.spec b/pdcurses/mingw32-pdcurses.spec
index 8b05777..14f6001 100644 (file)
--- a/pdcurses/mingw32-pdcurses.spec
+++ b/pdcurses/mingw32-pdcurses.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-pdcurses
 Version:        3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Curses library for MinGW
 
 License:        Public Domain
@@ -59,7 +59,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
 
 install win32/*.exe $RPM_BUILD_ROOT%{_mingw32_bindir}
 install win32/pdcurses.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/pdcurses.dll
-install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/pdcurses.dll.a
+install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpdcurses.dll.a
 install curses.h panel.h term.h $RPM_BUILD_ROOT%{_mingw32_includedir}
 
 
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_mingw32_bindir}/pdcurses.dll
-%{_mingw32_libdir}/pdcurses.dll.a
+%{_mingw32_libdir}/libpdcurses.dll.a
 %{_mingw32_includedir}/curses.h
 %{_mingw32_includedir}/panel.h
 %{_mingw32_includedir}/term.h
@@ -85,5 +85,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 22 2008 Richard Jones <rjones@redhat.com> - 3.4-2
+- Rename implib to libpdcurses.dll.a so that libtool can use it.
+
 * Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 3.4-1
 - Initial RPM release.

diff --git a/readline/mingw32-readline.spec b/readline/mingw32-readline.spec
index 810a232..9d8f6e8 100644 (file)
--- a/readline/mingw32-readline.spec
+++ b/readline/mingw32-readline.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-readline
 Version:        5.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW port of readline for editing typed command lines
 
 License:        GPLv2+
@@ -78,8 +78,8 @@ make SHLIB_LIBS=-ltermcap
 
 # Rebuild the DLLs correctly and create implibs.
 pushd shlib
-%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,readline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
-%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,history.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
+%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
+%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
 popd
 
 
@@ -92,9 +92,9 @@ pushd shlib
 rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib*.so.*
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 install readline.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install readline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+install libreadline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
 install history.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install history.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+install libhistory.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
 popd
 
 # Don't want the info files or manpages which duplicate the native package.
@@ -114,17 +114,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mingw32_bindir}/readline.dll
 %{_mingw32_bindir}/history.dll
-%{_mingw32_libdir}/readline.dll.a
-%{_mingw32_libdir}/history.dll.a
+%{_mingw32_libdir}/libreadline.dll.a
+%{_mingw32_libdir}/libhistory.dll.a
 %{_mingw32_includedir}/readline/
 
 
 %changelog
-* Wed Nov 19 2008 Richard W.M. Jones <rjones@example.com> - 5.2-3
+* Sat Nov 22 2008 Richard W.M. Jones <rjones@redhat.com> - 5.2-4
+- Rename *.dll.a to lib*.dll.a so that libtool can use these libraries.
+
+* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 5.2-3
 - Fix paths to mandir, infodir.
 
-* Fri Oct 31 2008 Richard W.M. Jones <rjones@example.com> - 5.2-2
+* Fri Oct 31 2008 Richard W.M. Jones <rjones@redhat.com> - 5.2-2
 - Rebuild against latest termcap.
 
-* Thu Sep 25 2008 Richard W.M. Jones <rjones@example.com> - 5.2-1
+* Thu Sep 25 2008 Richard W.M. Jones <rjones@redhat.com> - 5.2-1
 - Initial RPM release.

diff --git a/sqlite/mingw32-sqlite.spec b/sqlite/mingw32-sqlite.spec
index fc8f5f8..0855022 100644 (file)
--- a/sqlite/mingw32-sqlite.spec
+++ b/sqlite/mingw32-sqlite.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-sqlite
 Version:        3.5.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
 License:        Public Domain
@@ -18,7 +18,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Patch1:         sqlite-3.5.8-pkgconfig-version.patch
-Patch10:        mingw32-sqlite-3.5.9-no-undefined.patch
+
+Patch1000:      mingw32-sqlite-3.5.9-no-undefined.patch
 
 BuildRequires:  mingw32-filesystem >= 26
 BuildRequires:  mingw32-gcc
@@ -48,7 +49,7 @@ for Windows.
 %prep
 %setup -q -n sqlite-%{version}
 %patch1 -p1
-%patch10 -p1
+%patch1000 -p1
 
 # Ships with an old/broken version of libtool which cannot create
 # Windows libraries properly.  So pull in the current version.
@@ -66,9 +67,7 @@ libtoolize --force
 #   - RWMJ 2008-09-30
 export config_TARGET_EXEEXT=.exe
 
-%{_mingw32_configure} \
-  --with-readline-inc='-I%{_mingw32_includedir}/readline' \
-  --with-readline-lib=%{_mingw32_libdir}/readline.dll.a
+%{_mingw32_configure}
 make
 
 
@@ -97,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 22 2008 Richard Jones <rjones@redhat.com> - 3.5.9-3
+- Rebuild against new readline.
+
 * Fri Oct 31 2008 Richard Jones <rjones@redhat.com> - 3.5.9-2
 - Rebuild against latest termcap.