- updated to 1.1

[packages/ocaml-net.git] / ocaml-net.spec

diff --git a/ocaml-net.spec b/ocaml-net.spec
index c96dfe18e679170343a8aa33247dfb2313b799b5..5fd55dd89cd237a5ac5a07bf4a10501d76d1e2f5 100644 (file)
--- a/ocaml-net.spec
+++ b/ocaml-net.spec
@@ -1,12 +1,14 @@
 Summary:       Modules for Internet programming in OCaml
 Summary(pl):   Modu³y u³atwiaj±ce pisanie programów internetowych w OCamlu
 Name:          ocaml-net
-Version:       0.92
+Version:       1.1
 Release:       1
 License:       BSD
 Group:         Libraries
+Source0:       http://dl.sourceforge.net/ocamlnet/ocamlnet-%{version}.tar.gz
+# Source0-md5: 2ec265aeea6a6470e7493ab047cef261
 URL:           http://ocamlnet.sourceforge.net/
-Source0:       http://telia.dl.sourceforge.net/sourceforge/ocamlnet/ocamlnet-%{version}.tar.gz
+BuildRequires: ncurses-devel
 BuildRequires: ocaml-pcre-devel
 BuildRequires: ocaml-findlib
 BuildRequires: ocaml >= 3.04-7
@@ -84,50 +86,49 @@ mv -f Makefile.rules.tmp Makefile.rules
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml
+
 cd src
+%{__make} install OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+
 for f in cgi pop netstring ; do
-       %{__make} -C $f install \
-               INSTMETHOD=conventional \
-               LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/$f
        install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/$f
        mv $RPM_BUILD_ROOT%{_libdir}/ocaml/$f/META \
-               $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/$f
+               $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/$f/
        echo "directory = \"+$f\"" \
                >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/$f/META
 done
 cd ..
+# not sure about *.o
+rm $RPM_BUILD_ROOT%{_libdir}/ocaml/*/*.mli
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-{pop3,cgi}-%{version}
 cp -r examples/{cgi,jserv} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-cgi-%{version}
 cp -r examples/pop/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-pop3-%{version}
 
-gzip -9nf src/*/*.mli LICENSE README
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files netstring-devel
 %defattr(644,root,root,755)
-%doc *.gz src/netstring/*.gz
+%doc LICENSE README doc/intro/html
 %dir %{_libdir}/ocaml/netstring
-%{_libdir}/ocaml/netstring/*.cm[ixa]*
+%{_libdir}/ocaml/netstring/*.cm[ixao]*
 %{_libdir}/ocaml/netstring/*.a
 %{_libdir}/ocaml/site-lib/netstring
 
 %files cgi-devel
 %defattr(644,root,root,755)
-%doc *.gz src/cgi/*.gz
 %dir %{_libdir}/ocaml/cgi
-%{_libdir}/ocaml/cgi/*.cm[ixa]*
+%{_libdir}/ocaml/cgi/*.cm[ixao]*
 %{_libdir}/ocaml/cgi/*.a
 %{_libdir}/ocaml/site-lib/cgi
 %{_examplesdir}/%{name}-cgi-%{version}
 
 %files pop3-devel
 %defattr(644,root,root,755)
-%doc *.gz src/pop/*.gz
 %dir %{_libdir}/ocaml/pop
-%{_libdir}/ocaml/pop/*.cm[ixa]*
+%{_libdir}/ocaml/pop/*.cm[ixao]*
 %{_libdir}/ocaml/pop/*.a
 %{_libdir}/ocaml/site-lib/pop
 %{_examplesdir}/%{name}-pop3-%{version}