- fill in devel package reqs

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

diff --git a/ocaml-fuse.spec b/ocaml-fuse.spec
index f4b5b33d383648d2f25cccf657fdd27b9540328b..0ab84d03fa0fbd921570fed45960b1f264f2a84b 100644 (file)
--- a/ocaml-fuse.spec
+++ b/ocaml-fuse.spec
@@ -1,13 +1,13 @@
 #
 # Conditional build:
-%bcond_with    opt             # build opt
+%bcond_without opt             # build opt
 
 %define                modname Fuse
 Summary:       %{modname} binding for OCaml
 Summary(pl.UTF-8):     Wiązania %{modname} dla OCamla
 Name:          ocaml-fuse
 Version:       2.7
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/ocamlfuse/ocamlfuse-%{version}-1.tar.gz
@@ -15,8 +15,8 @@ Source0:      http://downloads.sourceforge.net/ocamlfuse/ocamlfuse-%{version}-1.tar.g
 URL:           http://sourceforge.net/apps/mediawiki/ocamlfuse/
 BuildRequires: libfuse-devel
 BuildRequires: ocaml >= 3.08
-BuildRequires: ocaml-camlidl >= 1.0.5
 BuildRequires: ocaml-findlib >= 1.4
+BuildRequires: ocaml-idl-devel >= 1.0.5
 %requires_eq   ocaml-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,6 +46,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
@@ -60,7 +62,8 @@ tej biblioteki.
 mv ocamlfuse/* .
 
 %build
-%{__make} -j1 all %{?with_opt:opt} -C lib \
+%{__make} -j1 all -C lib \
+       PACKS=camlidl \
        CC="%{__cc} %{rpmcflags} -fPIC"
 
 %install
@@ -68,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 cd lib
 
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{%{modname},stublibs}
-install -p *.cm[ixa]* *.a dll*.so $RPM_BUILD_ROOT%{_libdir}/ocaml/%{modname}
+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}
@@ -87,8 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
-%dir %{_libdir}/ocaml/%{modname}
-%attr(755,root,root) %{_libdir}/ocaml/%{modname}/dll*_stubs.so
 
 %files devel
 %defattr(644,root,root,755)