commit 23307fdbf7efa75e6bfff7a51a019d3a5d05b2f7
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 27 11:26:43 2021 +0100
- updated to 1.11
ocaml-zip.spec | 64 +++++++++++++++++++++++++++-------------------------------
1 file changed, 30 insertions(+), 34 deletions(-)
---
diff --git a/ocaml-zip.spec b/ocaml-zip.spec
index a072106..fd829d6 100644
--- a/ocaml-zip.spec
+++ b/ocaml-zip.spec
@@ -1,25 +1,27 @@
#
# Conditional build:
-%bcond_without ocaml_opt # skip building native optimized binaries
(bytecode is always built)
+%bcond_without ocaml_opt # native optimized binaries (bytecode is always
built)
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
-%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+# not yet available on x32 (ocaml 4.02.1), update when upstream will support it
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
%undefine with_ocaml_opt
%endif
Summary: Zlib binding for OCaml
Summary(pl.UTF-8): Wiązania Zlib dla OCamla
Name: ocaml-zip
-Version: 1.07
-%define gitver rel107
-Release: 4
-License: LGPL
+Version: 1.11
+%define gitver rel111
+Release: 1
+License: LGPL v2.1 with OCaml linking exception
Group: Libraries
-URL: http://pauillac.inria.fr/~xleroy/software.html
-Source0:
https://github.com/xavierleroy/camlzip/archive/%{gitver}/camlzip-%{version}.tar.gz
-# Source0-md5: 8babccb584dfd4eb7b98901122e818a9
-BuildRequires: ocaml >= 1:3.09.2
-BuildRequires: zlib-devel
+#Source0Download: https://github.com/xavierleroy/camlzip/tags
+Source0:
https://github.com/xavierleroy/camlzip/archive/%{gitver}.tar.gz?/camlzip-%{gitver}.tar.gz
+# Source0-md5: ee7a2ecf4801226003ba2cd1b1f11d4d
+URL: https://xavierleroy.org/software.html
+BuildRequires: ocaml >= 1:4.07
+BuildRequires: ocaml-findlib
+BuildRequires: zlib-devel >= 1.1.3
%requires_eq ocaml-runtime
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -68,54 +70,48 @@ tej biblioteki.
%setup -q -n camlzip-%{gitver}
%build
-%{__cc} %{rpmcflags} -fPIC -c zlibstubs.c
-%{__make} all %{?with_ocaml_opt:allopt} \
- OCAMLC=ocamlc
+%{__cc} %{rpmcflags} %{rpmcppflags} -fPIC -c zlibstubs.c
+
+%{__make} allbyt %{?with_ocaml_opt:allopt}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-%{__make} install %{?with_ocaml_opt:installopt} \
- INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/zip \
- OCAMLC="echo $RPM_BUILD_ROOT; true"
-
-install zlib.cm[ixa]* $RPM_BUILD_ROOT%{_libdir}/ocaml/zip
+%{__make} install \
+ OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-mv $RPM_BUILD_ROOT%{_libdir}/ocaml/zip/dll*.so
$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+# useless in rpm
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so.owner
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r test/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/zip/META <<EOF
-requires = ""
-version = "%{version}"
-directory = "+zip"
-archive(byte) = "zip.cma"
-archive(native) = "zip.cmxa"
-linkopts = ""
-EOF
+cp -pr test/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ocaml/stublibs/*.so
+%doc Changes LICENSE README.md
+%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllcamlzip.so
%if %{with ocaml_opt}
%{_libdir}/ocaml/zip/*.cmxs
%endif
%files devel
%defattr(644,root,root,755)
-%doc README *.mli
+%dir %{_libdir}/ocaml/camlzip
+%{_libdir}/ocaml/camlzip/META
%dir %{_libdir}/ocaml/zip
%{_libdir}/ocaml/zip/META
%{_libdir}/ocaml/zip/*.cma
-%{_libdir}/ocaml/zip/*.cm[ix]
+%{_libdir}/ocaml/zip/*.cmi
+%{_libdir}/ocaml/zip/*.cmt
+%{_libdir}/ocaml/zip/*.cmti
%{_libdir}/ocaml/zip/*.mli
%{_libdir}/ocaml/zip/libcamlzip.a
%if %{with ocaml_opt}
+%{_libdir}/ocaml/zip/*.cmx
%{_libdir}/ocaml/zip/*.cmxa
%{_libdir}/ocaml/zip/zip.a
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocaml-zip.git/commitdiff/23307fdbf7efa75e6bfff7a51a019d3a5d05b2f7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
