[projects/template-specs] - no split site-lib anymore

baggins baggins at pld-linux.org
Sat Mar 27 10:09:02 CET 2021


commit 59705d579c4c368de12210f295784882cd38b5d7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 27 10:08:42 2021 +0100

    - no split site-lib anymore

 ocaml.spec | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/ocaml.spec b/ocaml.spec
index 1f338eb..5998d2a 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -66,6 +66,7 @@ biblioteki TEMPLATE.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 %{__make} install \
@@ -74,14 +75,6 @@ install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 #install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 #cp -r foo bar $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# move to dir pld ocamlfind looks
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-mv $OCAMLFIND_DESTDIR/%{module}/META \
-	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}/META
-directory="+%{module}"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
 %dir %{_libdir}/ocaml/%{module}
+%{_libdir}/ocaml/%{module}/META
 %{_libdir}/ocaml/%{module}/*.cma
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/%{module}/*.cmxs
@@ -105,5 +99,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/%{module}/*.cmx
 %{_libdir}/ocaml/%{module}/*.cmxa
 %endif
-%{_libdir}/ocaml/site-lib/%{module}
 %{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/59705d579c4c368de12210f295784882cd38b5d7



More information about the pld-cvs-commit mailing list