[ocaml-zip] Add -fix-ints patch to fix build. Drop obsolete ExcludeArch. Fix license handling.
Jerry James
jjames at fedoraproject.org
Tue Sep 2 19:26:41 UTC 2014
commit 042a2b488a5ec6fc8402cd59baf4d75e507481d9
Author: Jerry James <loganjerry at gmail.com>
Date: Tue Sep 2 13:26:14 2014 -0600
Add -fix-ints patch to fix build.
Drop obsolete ExcludeArch.
Fix license handling.
ocaml-zip-1.05-fix-ints.patch | 11 +++++++++++
ocaml-zip.spec | 15 +++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/ocaml-zip-1.05-fix-ints.patch b/ocaml-zip-1.05-fix-ints.patch
new file mode 100644
index 0000000..f243bba
--- /dev/null
+++ b/ocaml-zip-1.05-fix-ints.patch
@@ -0,0 +1,11 @@
+--- zlibstubs.c.orig 2012-10-11 21:36:07.000000000 -0600
++++ zlibstubs.c 2014-09-02 13:17:35.738662922 -0600
+@@ -23,6 +23,8 @@
+ #include <caml/fail.h>
+ #include <caml/memory.h>
+
++#define uint32 uint32_t
++
+ #define ZStream_val(v) ((z_stream *) (v))
+
+ static value * camlzip_error_exn = NULL;
diff --git a/ocaml-zip.spec b/ocaml-zip.spec
index 4869e98..43c4e32 100644
--- a/ocaml-zip.spec
+++ b/ocaml-zip.spec
@@ -8,8 +8,8 @@ License: LGPLv2 with exceptions
URL: http://forge.ocamlcore.org/projects/camlzip/
Source0: https://forge.ocamlcore.org/frs/download.php/1037/camlzip-%{version}.tar.gz
-
-ExcludeArch: sparc64 s390 s390x
+# Adapt to changed integer type names in ocaml 4.02.0
+Patch0: %{name}-1.05-fix-ints.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
@@ -37,6 +37,7 @@ developing applications that use %{name}.
%prep
%setup -q -n camlzip-%{version}
+%patch0
%build
@@ -67,7 +68,7 @@ ocamlfind install zip *.cma *.cmxa *.a *.cmx *.cmi *.mli dll*.so META
%files
-%doc LICENSE
+%license LICENSE
%{_libdir}/ocaml/zip
%if %opt
%exclude %{_libdir}/ocaml/zip/*.a
@@ -80,7 +81,8 @@ ocamlfind install zip *.cma *.cmxa *.a *.cmx *.cmi *.mli dll*.so META
%files devel
-%doc LICENSE Changes README
+%doc Changes README
+%license LICENSE
%if %opt
%{_libdir}/ocaml/zip/*.a
%{_libdir}/ocaml/zip/*.cmxa
@@ -90,6 +92,11 @@ ocamlfind install zip *.cma *.cmxa *.a *.cmx *.cmi *.mli dll*.so META
%changelog
+* Tue Sep 2 2014 Jerry James <loganjerry at gmail.com> - 1.05-8
+- Add -fix-ints patch to fix build
+- Drop obsolete ExcludeArch
+- Fix license handling
+
* Sun Aug 31 2014 Richard W.M. Jones <rjones at redhat.com> - 1.05-8
- Bump release and rebuild.
More information about the scm-commits
mailing list