- fix non-opt files

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

diff --git a/ocaml-curl.spec b/ocaml-curl.spec
index 383fa81f7a841022b75a48050af143159afaa054..9f875052795e290fbeef1ae463b9161031265af4 100644 (file)
--- a/ocaml-curl.spec
+++ b/ocaml-curl.spec
@@ -11,12 +11,12 @@
 %define        pkgname curl
 Summary:       OCaml Curl library (ocurl)
 Name:          ocaml-%{pkgname}
-Version:       0.7.1
+Version:       0.9.1
 Release:       2
 License:       MIT
 Group:         Libraries
-Source0:       https://forge.ocamlcore.org/frs/download.php/1400/ocurl-%{version}.tar.gz
-# Source0-md5: d138fd78538ae3bd008d6e9c2993d240
+Source0:       https://github.com/ygrek/ocurl/releases/download/%{version}/ocurl-%{version}.tar.gz
+# Source0-md5: 1ff6b12803fa0c6e9a4358dd29b83910
 Patch0:                ocaml_opt.patch
 URL:           http://ocurl.forge.ocamlcore.org/
 BuildRequires: curl-devel >= 7.12.0
@@ -49,11 +49,7 @@ developing applications that use %{name}.
 
 %build
 %configure
-%{__make} -j1 all \
-%if %{with ocaml_opt}
-       OCBYTE="ocamlc.opt -g" \
-       OCOPT="ocamlopt.opt -g"
-%endif
+%{__make} -j1 all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,8 +62,7 @@ install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 # Install curl.mli
 cp -p curl.mli $OCAMLFIND_DESTDIR/curl
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/curl
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/curl/META <<EOF
+cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/curl/META <<EOF
 requires = ""
 version = "%{version}"
 directory = "+curl"
@@ -85,25 +80,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING
-%{_libdir}/ocaml/curl
+%dir %{_libdir}/ocaml/curl
+%{_libdir}/ocaml/curl/META
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllcurl-helper.so
 %{_libdir}/ocaml/stublibs/dllcurl-helper.so.owner
+%{_libdir}/ocaml/curl/*.cma
 %if %{with ocaml_opt}
-%exclude %{_libdir}/ocaml/curl/*.a
-%exclude %{_libdir}/ocaml/curl/*.o
-%exclude %{_libdir}/ocaml/curl/*.cmx
-%exclude %{_libdir}/ocaml/curl/*.cmxa
+%attr(755,root,root) %{_libdir}/ocaml/curl/*.cmxs
 %endif
-%exclude %{_libdir}/ocaml/curl/*.mli
 
 %files devel
 %defattr(644,root,root,755)
 %doc examples/*
-%if %{with ocaml_opt}
 %{_libdir}/ocaml/curl/*.a
-%{_libdir}/ocaml/curl/*.o
+%{_libdir}/ocaml/curl/*.cmi
+%{_libdir}/ocaml/curl/*.cmt
+%{_libdir}/ocaml/curl/*.cmti
+%if %{with ocaml_opt}
 %{_libdir}/ocaml/curl/*.cmx
 %{_libdir}/ocaml/curl/*.cmxa
 %endif
 %{_libdir}/ocaml/curl/*.mli
-%{_libdir}/ocaml/site-lib/curl