X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml-fuse.git;a=blobdiff_plain;f=ocaml-fuse.spec;h=907960853a402619ac99fe88921f271665841287;hp=f7c001014e208714062b576ef06ae5d9d2f33da2;hb=2b7020f;hpb=486effbf1ab0ea7824d9105f04cc93a32d6725d6

diff --git a/ocaml-fuse.spec b/ocaml-fuse.spec
index f7c0010..9079608 100644
--- a/ocaml-fuse.spec
+++ b/ocaml-fuse.spec
@@ -1,20 +1,28 @@
 #
 # Conditional build:
-%bcond_without	opt		# build opt
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
 
-%define		modname	Fuse
-Summary:	%{modname} binding for OCaml
-Summary(pl.UTF-8):	Wiązania %{modname} dla OCamla
+# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
+%endif
+
+%define		module	Fuse
+Summary:	Fuse binding for OCaml
+Summary(pl.UTF-8):	Wiązania Fuse dla OCamla
 Name:		ocaml-fuse
-Version:	2.7
-Release:	1
+Version:	2.7.1
+Release:	3
 License:	GPL v2
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/ocamlfuse/ocamlfuse-%{version}-1.tar.gz
-# Source0-md5:	cb9cbe4fafb36ead1b78faaacc26f3e3
+Source0:	https://github.com/astrada/ocamlfuse/archive/v%{version}_cvs7/ocamlfuse-%{version}-7.tar.gz
+# Source0-md5:	a5da871a0983b6723c6b9b735898fe34
+Patch0:		keep-name.patch
+Patch1:		no-wrapped.patch
 URL:		http://sourceforge.net/apps/mediawiki/ocamlfuse/
 BuildRequires:	libfuse-devel
 BuildRequires:	ocaml >= 3.08
+BuildRequires:	ocaml-dune
 BuildRequires:	ocaml-findlib >= 1.4
 BuildRequires:	ocaml-idl-devel >= 1.0.5
 %requires_eq	ocaml-runtime
@@ -46,6 +54,8 @@ Summary(pl.UTF-8):	Wiązania ocamlfuse dla OCamla - cześć programistyczna
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 %requires_eq	ocaml
+Requires:	libfuse-devel
+Requires:	ocaml-idl-devel >= 1.0.5
 
 %description devel
 This package contains files needed to develop OCaml programs using
@@ -56,43 +66,45 @@ Pakiet ten zawiera pliki niezbędne do tworzenia programów używających
 tej biblioteki.
 
 %prep
-%setup -qc
-mv ocamlfuse/* .
+%setup -q -n ocamlfuse-2.7.1_cvs7
+%patch0 -p1
+%patch1 -p1
+
+%{__mv} {ocamlfuse,Fuse}.opam
 
 %build
-%{__make} -j1 all -C lib \
-	PACKS=camlidl \
-	CC="%{__cc} %{rpmcflags} -fPIC"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd lib
-
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{%{modname},stublibs}
-install -p *.cm[ixa]* *.a $RPM_BUILD_ROOT%{_libdir}/ocaml/%{modname}
-install -p dll*.so $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{modname}
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{modname}/META <<EOF
-requires = ""
-version = "%{version}"
-directory = "+%{modname}"
-archive(byte) = "%{modname}.cma"
-archive(native) = "%{modname}.cmxa"
-linkopts = ""
-EOF
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_libdir}/ocaml/%{module}/META
+%{_libdir}/ocaml/%{module}/dune-package
+%{_libdir}/ocaml/%{module}/opam
+%{_libdir}/ocaml/%{module}/*.cmi
+%{_libdir}/ocaml/%{module}/*.cmt
+%{_libdir}/ocaml/%{module}/*.cmti
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/%{module}/*.cmxs
+%endif
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc LICENSE lib/*.mli
-%dir %{_libdir}/ocaml/%{modname}
-%{_libdir}/ocaml/%{modname}/*.cm[ixa]*
-%{_libdir}/ocaml/%{modname}/*.a
-%{_libdir}/ocaml/site-lib/%{modname}
+%dir %{_libdir}/ocaml/%{module}
+%{_libdir}/ocaml/%{module}/*.cma
+%{_libdir}/ocaml/%{module}/*.cm[ix]
+%{_libdir}/ocaml/%{module}/*.a
+%{_libdir}/ocaml/%{module}/*.mli
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/%{module}/*.cmxa
+%endif