- up to 0.4.1

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

diff --git a/ocaml-gapi-ocaml.spec b/ocaml-gapi-ocaml.spec
index 0a8f824e2c81726de14a8b425072c711bd8e3be9..b0066fbe3fa510a364cf5a15fd641ac15250cf2a 100644 (file)
--- a/ocaml-gapi-ocaml.spec
+++ b/ocaml-gapi-ocaml.spec
@@ -11,13 +11,12 @@
 %define                debug_package   %{nil}
 Summary:       Google Data Protocol (GData) client library
 Name:          ocaml-%{pkgname}
-Version:       0.3.6
+Version:       0.4.1
 Release:       1
 License:       MIT
 Group:         Libraries
 Source0:       https://github.com/astrada/gapi-ocaml/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b8759b3a9010769db86786141ed374dd
-Patch0:                jbuilder.patch
+# Source0-md5: aeecae11fddf4511cea908808c73366a
 URL:           http://gapi-ocaml.forge.ocamlcore.org/
 BuildRequires: cppo >= 0.9.3
 BuildRequires: ocaml >= 4.02.3
@@ -25,10 +24,8 @@ BuildRequires:       ocaml-biniou-devel >= 1.0.6
 BuildRequires: ocaml-cryptokit-devel >= 1.9
 BuildRequires: ocaml-curl-devel >= 0.6.0
 BuildRequires: ocaml-easy-format-devel >= 1.0.1
-BuildRequires: ocaml-extlib-devel >= 1.5.4
 BuildRequires: ocaml-findlib >= 1.4
 BuildRequires: ocaml-net-netstring-devel >= 4.1.4
-BuildRequires: ocaml-xmlm-devel >= 1.1.1
 BuildRequires: ocaml-yojson-devel >= 1.1.6
 %requires_eq   ocaml-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,15 +44,12 @@ używających tej biblioteki.
 Summary:       Google Data Protocol (GData) client library - development part
 Summary(pl.UTF-8):     Wiązania gapi dla OCamla - cześć programistyczna
 Group:         Development/Libraries
-%requires_eq   ocaml
+%requires_eq ocaml
 Requires:      ocaml-biniou-devel >= 1.0.6
 Requires:      ocaml-cryptokit-devel >= 1.9
 Requires:      ocaml-curl-devel >= 0.6.0
 Requires:      ocaml-easy-format-devel >= 1.0.1
-Requires:      ocaml-extlib-devel >= 1.5.4
-Requires:      ocaml-net-netstring-devel >= 3.6
-#Requires:     ocaml-net-netstring-devel >= 3.7.3
-Requires:      ocaml-xmlm-devel >= 1.1.1
+Requires:      ocaml-net-netstring-devel >= 3.7.3
 Requires:      ocaml-yojson-devel >= 1.1.6
 
 %description devel
@@ -68,26 +62,22 @@ tej biblioteki.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p1 -R
 
 %build
-ocaml setup.ml -configure \
-       --destdir $RPM_BUILD_ROOT
-ocaml setup.ml -build
+dune build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-install -d $OCAMLFIND_DESTDIR
-ocaml setup.ml -install
+
+dune install --destdir=$RPM_BUILD_ROOT
 
 # move to dir pld ocamlfind looks
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{pkgname}
-mv $OCAMLFIND_DESTDIR/%{pkgname}/META \
-       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{pkgname}
-cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{pkgname}/META
+cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/%{pkgname}/META
 directory="+%{pkgname}"
 EOF
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{pkgname}
+ln -sr $RPM_BUILD_ROOT%{_libdir}/ocaml/%{pkgname}/META \
+       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{pkgname}
 
 # no standard way of packaging .mli docs in pld. just drop
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/%{pkgname}/*.mli
@@ -99,7 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc LICENSE
 %dir %{_libdir}/ocaml/%{pkgname}
-%{_libdir}/ocaml/%{pkgname}/*.annot
+%{_libdir}/ocaml/gapi-ocaml/META
+%{_libdir}/ocaml/gapi-ocaml/dune-package
+%{_libdir}/ocaml/gapi-ocaml/opam
 %{_libdir}/ocaml/%{pkgname}/*.cma
 %{_libdir}/ocaml/%{pkgname}/*.cmt*
 %{_libdir}/ocaml/%{pkgname}/*.cm[ix]