[packages/ocaml-ocamlbuild] - fix META install - rel 3

baggins baggins at pld-linux.org
Wed Mar 24 22:33:38 CET 2021


commit 8b2377742bc3182c483253d599ce2ddc10b0d8b2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 24 22:33:01 2021 +0100

    - fix META install
    - rel 3

 ocaml-ocamlbuild.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/ocaml-ocamlbuild.spec b/ocaml-ocamlbuild.spec
index 2f5bf11..cdf717d 100644
--- a/ocaml-ocamlbuild.spec
+++ b/ocaml-ocamlbuild.spec
@@ -16,7 +16,7 @@ Summary:	Build tool for OCaml libraries and programs
 Summary(pl.UTF-8):	Narzędzie do budowania bibliotek i programów napisanych w OCamlu
 Name:		ocaml-%{module}
 Version:	0.14.0
-Release:	2
+Release:	3
 License:	LGPL v2+ with exceptions
 Group:		Development/Languages
 Source0:	https://github.com/ocaml/ocamlbuild/archive/%{version}/%{module}-%{version}.tar.gz
@@ -71,14 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -p man/ocamlbuild.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-# move to dir pld ocamlfind looks
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-%{__mv} $OCAMLFIND_DESTDIR/%{module}/META \
-	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}/META
+cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/%{module}/META
 directory="+%{module}"
 EOF
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
+ln -sr $RPM_BUILD_ROOT%{_libdir}/ocaml/%{module}/META \
+	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,9 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_mandir}/man1/ocamlbuild.1*
 %dir %{_libdir}/ocaml/ocamlbuild
+%{_libdir}/ocaml/ocamlbuild/META
 %{_libdir}/ocaml/ocamlbuild/ocamlbuild*.cmi
 %{_libdir}/ocaml/ocamlbuild/ocamlbuild.cmo
 %{_libdir}/ocaml/ocamlbuild/ocamlbuildlib.cma
+%{_libdir}/ocaml/site-lib/ocamlbuild
 
 %files devel
 %defattr(644,root,root,755)
@@ -109,4 +109,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/ocamlbuild/signatures.cmi
 %{_libdir}/ocaml/ocamlbuild/signatures.cmti
 %{_libdir}/ocaml/ocamlbuild/signatures.mli
-%{_libdir}/ocaml/site-lib/ocamlbuild
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-ocamlbuild.git/commitdiff/8b2377742bc3182c483253d599ce2ddc10b0d8b2



More information about the pld-cvs-commit mailing list