X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=readline%2Fmingw32-readline.spec;h=9d8f6e861ff093eea6cd6bdec433224492df3f47;hb=ddcd49d475701a9c950151fd420ac7f6f9694cc4;hp=1449019a624abed3d8f72713860e12cf4c9e4612;hpb=b3a3aaaf2afc25865d7879cf8f73bdb214496bae;p=fedora-mingw.git

diff --git a/readline/mingw32-readline.spec b/readline/mingw32-readline.spec
index 1449019..9d8f6e8 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:        4%{?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
@@ -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,13 +92,14 @@ 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.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/{info,man}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
 
 # Don't want the static library.
 rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libhistory.a
@@ -113,11 +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
-* Thu Sep 25 2008 Richard W.M. Jones <rjones@example.com> - 5.2-1
+* 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@redhat.com> - 5.2-2
+- Rebuild against latest termcap.
+
+* Thu Sep 25 2008 Richard W.M. Jones <rjones@redhat.com> - 5.2-1
 - Initial RPM release.