[packages/ocaml-extlib] - up to 1.7.8

baggins baggins at pld-linux.org
Thu Mar 25 08:26:27 CET 2021


commit 92945d9f46a9b527c29cb2be4b7df55f96548565
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 25 08:26:07 2021 +0100

    - up to 1.7.8

 no-git.patch      |  8 ++++++++
 ocaml-extlib.spec | 30 ++++++++++++++++++------------
 2 files changed, 26 insertions(+), 12 deletions(-)
---
diff --git a/ocaml-extlib.spec b/ocaml-extlib.spec
index 1f67fec..fea983d 100644
--- a/ocaml-extlib.spec
+++ b/ocaml-extlib.spec
@@ -12,13 +12,14 @@
 Summary:	ExtLib for OCaml
 Summary(pl.UTF-8):	ExtLib dla OCamla
 Name:		ocaml-%{pkgname}
-Version:	1.5.4
-Release:	5
+Version:	1.7.8
+Release:	1
 License:	LGPL + OCaml linking exception
 Group:		Libraries
-Source0:	http://ocaml-extlib.googlecode.com/files/%{pkgname}-%{version}.tar.gz
-# Source0-md5:	329041625309b9e49051e5b097a9185d
-URL:		http://code.google.com/p/ocaml-extlib/
+Source0:	https://github.com/ygrek/ocaml-extlib/releases/download/%{version}/extlib-%{version}.tar.gz
+# Source0-md5:	7e0df072af4e2daa094e5936a661cb11
+Patch0:		no-git.patch
+URL:		https://github.com/ygrek/ocaml-extlib
 BuildRequires:	ocaml >= %{ocaml_ver}
 BuildRequires:	ocaml-findlib-devel
 %requires_eq	ocaml-runtime
@@ -88,10 +89,10 @@ użyciem tej biblioteki.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %build
-%{__make} -j1 all %{?with_ocaml_opt:opt} \
-	CC="%{__cc} %{rpmcflags} -fPIC"
+%{__make} build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,23 +100,28 @@ install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
 
 OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml %{__make} install
 
-mv $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/META \
-	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
 echo 'directory = "+extlib"' \
-	>> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib/META
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/*.mli
+	>> $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/META
+ln -sr $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/META \
+	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/*.mli
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc LICENSE *.mli README.txt
+%doc LICENSE src/*.mli README.md
 %dir %{_libdir}/ocaml/extlib
+%{_libdir}/ocaml/extlib/META
 %{_libdir}/ocaml/extlib/*.cm[ix]
 %{_libdir}/ocaml/extlib/*.cma
+%{_libdir}/ocaml/extlib/*.cmt
+%{_libdir}/ocaml/extlib/*.cmti
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/extlib/*.a
 %{_libdir}/ocaml/extlib/*.cmxa
+%{_libdir}/ocaml/extlib/*.cmxs
 %endif
 %{_libdir}/ocaml/site-lib/extlib
diff --git a/no-git.patch b/no-git.patch
new file mode 100644
index 0000000..054908f
--- /dev/null
+++ b/no-git.patch
@@ -0,0 +1,8 @@
+--- extlib-1.7.8/Makefile~	2021-01-20 00:51:04.000000000 +0100
++++ extlib-1.7.8/Makefile	2021-03-25 08:22:47.071582273 +0100
+@@ -1,5 +1,4 @@
+ 
+-VERSION:=$(shell git --git-dir=.git describe --always --long)
+ RELEASE:=1.7.8
+ 
+ ifndef VERSION
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-extlib.git/commitdiff/92945d9f46a9b527c29cb2be4b7df55f96548565



More information about the pld-cvs-commit mailing list