The package rpms/ocaml-zip.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-zip.git/commit/?id=76e3505c....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit fa9958ccb1559909fb00d689a0f0b2aea9d20469
Merge: a1efad1 76e3505
Author: Jerry James <loganjerry(a)gmail.com>
Date: Wed Apr 1 10:25:20 2020 -0600
Merge branch 'master' into f32
diff --cc ocaml-zip.spec
index 1b945f5,df08c8f..5b08aba
--- a/ocaml-zip.spec
+++ b/ocaml-zip.spec
@@@ -92,9 -98,11 +98,14 @@@ cmp Makefile Makefile.uncompresse
%changelog
+ * Mon Mar 30 2020 Jerry James <loganjerry(a)gmail.com> - 1.10-1
+ - Version 1.10
+ - New URLs
+ - Add check script
+
+* Thu Feb 27 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.06-24.1
+- OCaml 4.10.0 final (Fedora 32).
+
* Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.06-24
- OCaml 4.10.0 final.
commit 76e3505c4bfa2269d2f7c236631fa65d3eda4241
Author: Jerry James <loganjerry(a)gmail.com>
Date: Wed Apr 1 10:02:57 2020 -0600
Version 1.10. New URLs. Add check script.
diff --git a/.gitignore b/.gitignore
index d2d5fb4..92e783d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-camlzip-1.04.tar.gz
-/camlzip-1.05.tar.gz
-/camlzip-1.06.tar.gz
+/camlzip-*.tar.gz
+/rel*.tar.gz
diff --git a/ocaml-zip.spec b/ocaml-zip.spec
index b3b313a..df08c8f 100644
--- a/ocaml-zip.spec
+++ b/ocaml-zip.spec
@@ -1,18 +1,18 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
Name: ocaml-zip
-Version: 1.06
-Release: 24%{?dist}
+Version: 1.10
+Release: 1%{?dist}
Summary: OCaml library for reading and writing zip, jar and gzip files
License: LGPLv2 with exceptions
-URL:
http://forge.ocamlcore.org/projects/camlzip/
-Source0:
https://forge.ocamlcore.org/frs/download.php/1037/camlzip-%{version}.tar.gz
+%global upver %(sed 's/\\.//' <<< %{version})
+
+URL:
https://xavierleroy.org/software.html
+Source0:
https://github.com/xavierleroy/camlzip/archive/rel%{upver}.tar.gz
BuildRequires: ocaml >= 3.10.0
-BuildRequires: ocaml-findlib-devel
-BuildRequires: zlib-devel >= 1.1.3
-BuildRequires: chrpath
+BuildRequires: ocaml-findlib
+BuildRequires: ocaml-ocamldoc
+BuildRequires: pkgconfig(zlib)
%description
@@ -24,7 +24,7 @@ formats.
%package devel
Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -33,24 +33,24 @@ developing applications that use %{name}.
%prep
-%setup -q -n camlzip-%{version}
+%autosetup -n camlzip-rel%{upver}
+
+# Do not try to overwrite the system ld.conf
+sed -i "s,ocamlfind install,& -ldconf $PWD/ld.conf," Makefile
+
+# The META file has the wrong version number
+sed -i 's/1\.09/%{version}/' META-zip
%build
make all
-%if %opt
+%ifarch %{ocaml_native_compiler}
make allopt
%endif
-chrpath --delete dll*.so
+make doc
-cat > META <<EOF
-name = "%{name}"
-version = "%{version}"
-description = "%{description}"
-requires = "unix"
-archive(byte) = "zip.cma"
-archive(native) = "zip.cmxa"
-EOF
+# Relink the stublibs with $RPM_LD_FLAGS.
+ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -lz -o camlzip $(ar t libcamlzip.a)
%install
@@ -59,31 +59,37 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/stublibs
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+export EXT_DLL=.so
-%if %opt
-ocamlfind install zip *.cma *.cmxa *.a *.cmx *.cmi *.mli dll*.so META
-%else
-ocamlfind install zip *.cma *.a *.cmi *.mli dll*.so META
-%endif
+touch ld.conf
+make install
+
+
+%check
+export LD_LIBRARY_PATH=$PWD
+make -C test
+test/testzlib Makefile Makefile.gz
+test/testzlib -d Makefile.gz Makefile.uncompressed
+cmp Makefile Makefile.uncompressed
%files
%license LICENSE
-%{_libdir}/ocaml/zip
-%if %opt
-%exclude %{_libdir}/ocaml/zip/*.a
-%exclude %{_libdir}/ocaml/zip/*.cmxa
-%exclude %{_libdir}/ocaml/zip/*.cmx
+%{_libdir}/ocaml/camlzip/
+%dir %{_libdir}/ocaml/zip/
+%{_libdir}/ocaml/zip/META
+%{_libdir}/ocaml/zip/*.cma
+%{_libdir}/ocaml/zip/*.cmi
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/zip/*.cmxs
%endif
-%exclude %{_libdir}/ocaml/zip/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
+%{_libdir}/ocaml/stublibs/dllcamlzip.so
+%{_libdir}/ocaml/stublibs/dllcamlzip.so.owner
%files devel
-%doc Changes README
-%license LICENSE
-%if %opt
+%doc Changes README doc
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/zip/*.a
%{_libdir}/ocaml/zip/*.cmxa
%{_libdir}/ocaml/zip/*.cmx
@@ -92,6 +98,11 @@ ocamlfind install zip *.cma *.a *.cmi *.mli dll*.so META
%changelog
+* Mon Mar 30 2020 Jerry James <loganjerry(a)gmail.com> - 1.10-1
+- Version 1.10
+- New URLs
+- Add check script
+
* Wed Feb 26 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.06-24
- OCaml 4.10.0 final.
diff --git a/sources b/sources
index 795845b..0c5d074 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0874be16d02a7165dfc31edc06636e4c camlzip-1.06.tar.gz
+SHA512 (rel110.tar.gz) =
5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9