X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml-curses%2Fmingw32-ocaml-curses.spec;h=a6cba4ee0eb100b42732d99b7ddce0d7b1fe146d;hb=55e25117740874bdc2e23ea1fe42e3f74ae15c01;hp=8557de814edef6aa51624bd848ccaef6714a9530;hpb=08ad93f44c0e89aa241804a7cdeabe2df5689c2c;p=fedora-mingw.git

diff --git a/ocaml-curses/mingw32-ocaml-curses.spec b/ocaml-curses/mingw32-ocaml-curses.spec
index 8557de8..a6cba4e 100644
--- a/ocaml-curses/mingw32-ocaml-curses.spec
+++ b/ocaml-curses/mingw32-ocaml-curses.spec
@@ -4,11 +4,8 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
-# For versioning, please see the native Fedora package.
-%define alphatag 20020319
-
 Name:           mingw32-ocaml-curses
-Version:        0.1
+Version:        1.0.3
 Release:        2%{?dist}
 Summary:        MinGW Windows OCaml bindings for ncurses
 
@@ -16,11 +13,7 @@ License:        LGPLv2+
 Group:          Development/Libraries
 
 URL:            http://savannah.nongnu.org/projects/ocaml-tmk/
-Source0:        ocaml-curses-%{alphatag}.tar.gz
-
-# Patches for MinGW:
-Patch1000:      mingw32-ocaml-curses-0.1-build.patch
-Patch1001:      mingw32-ocaml-curses-0.1-win32-functions.patch
+Source0:        http://download.savannah.gnu.org/releases/ocaml-tmk/ocaml-curses-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -29,55 +22,56 @@ BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml-findlib
 BuildRequires:  mingw32-pdcurses
 
+# Upstream package doesn't come with a configure script so
+# we have to rebuild it.
+BuildRequires:  autoconf, automake, libtool
+
+Requires:       mingw32-pdcurses
+
 
 %description
 OCaml bindings for curses.
 
 
 %prep
-%setup -q -c -n %{name}-%{alphatag}
+%setup -q -n ocaml-curses-%{version}
 
-%patch1000 -p1
-%patch1001 -p1
+autoreconf
 
 
 %build
 ulimit -s unlimited
 
-cd curses
+%{_mingw32_configure}
 
-make \
-  OCAMLC=%{_mingw32_target}-ocamlopt \
+make all opt \
+  OCAMLC=%{_mingw32_target}-ocamlc \
   OCAMLOPT=%{_mingw32_target}-ocamlopt \
   OCAMLMKLIB=%{_mingw32_target}-ocamlmklib \
-  CURSES=%{_mingw32_libdir}/pdcurses.dll.a opt
+  OCAMLMKLIB_FLAGS="-L%{_mingw32_libdir}" \
+  CLIBS="" \
+  all opt
 
-cat > META <<EOF
-name = "curses"
-version = "%{version}"
-description = "OCaml bindings for ncurses"
-requires = ""
-archive(byte) = "mlcurses.cma"
-archive(native) = "mlcurses.cmxa"
-EOF
+# Build the test program just to check that everything is OK.
+%{_mingw32_target}-ocamlopt -I . \
+  -o test.opt \
+  curses.cmxa \
+  test.ml \
+  -cclib "-L%{_mingw32_libdir} pdcurses.dll.a"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/curses
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs
+export OCAMLFIND_CONF=%{_sysconfdir}/%{_mingw32_target}-ocamlfind.conf
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml
 
-pushd curses
-install mlcurses.cmxa mlcurses.a *.cmi *.cmx *.mli \
-  $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/curses
-# XXX Not really clear if this file is necessary.
-install dllmlcurses.dll \
-  $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/stublibs
-popd
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+ocamlfind install curses META *.cmi *.cmx *.cmxa *.a *.mli
 
 
 %clean
@@ -87,9 +81,23 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_libdir}/%{_mingw32_target}-ocaml/curses/
-%{_libdir}/%{_mingw32_target}-ocaml/stublibs/dllmlcurses.dll
 
 
 %changelog
-* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-2
+* Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-2
+- Runtime requires PDCurses library.
+
+* Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-1
+- New upstream version 1.0.3 with proper support for Windows
+  and PDCurses.
+
+* Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 0.1-4
+- libmlcurses.a contained a copy of pdcurses.dll.a in error.
+
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 0.1-3
+- Use ocamlfind to install in the correct location.
+- Install the META file.
+- Fix the version number in changelog.
+
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 0.1-2
 - Initial release.