The package rpms/ocaml-camlimages.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-camlimages.git/commit/?id=7....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 739181cf161fd29e3338ddb4e5f9d73fe90f311b
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Aug 9 11:19:06 2017 +0100
New upstream version 4.2.4.
- Replace opt test with ocaml_native_compiler.
- Pass -g option to ocamlopt so debuginfo is generated correctly.
diff --git a/.gitignore b/.gitignore
index d1c5f92..02e8c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ camlimages-3.0.2.tgz
/v4.0.1.tar.gz
/4.1.0.tar.gz
/4.2.2.tar.gz
+/4.2.4.tar.gz
diff --git a/camlimages-4.2.4-add-g-flag.patch b/camlimages-4.2.4-add-g-flag.patch
new file mode 100644
index 0000000..359b313
--- /dev/null
+++ b/camlimages-4.2.4-add-g-flag.patch
@@ -0,0 +1,11 @@
+--- camlspotter-camlimages-13777ef409e7/OMakefile.old 2017-08-09 11:22:20.223133043
+0100
++++ camlspotter-camlimages-13777ef409e7/OMakefile 2017-08-09 11:22:26.886132978 +0100
+@@ -19,7 +19,7 @@
+ # For release, -warn-error should not be put
+
+ # OCAMLFLAGS= -w A-4-9-35-37-40-41-42-44-45-48
+-OCAMLFLAGS= -w A-4-9-37-40-41-42-44-45-41-48-50 -unsafe-string
++OCAMLFLAGS= -w A-4-9-37-40-41-42-44-45-41-48-50 -unsafe-string -g
+
+ # For the development, -warn-error A is turned on
+ if $(file-exists DEV)
diff --git a/ocaml-camlimages.spec b/ocaml-camlimages.spec
index 85644de..a7b096a 100644
--- a/ocaml-camlimages.spec
+++ b/ocaml-camlimages.spec
@@ -1,8 +1,6 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
Name: ocaml-camlimages
-Version: 4.2.2
-Release: 8%{?dist}
+Version: 4.2.4
+Release: 1%{?dist}
Summary: OCaml image processing library
License: LGPLv2 with exceptions
@@ -14,6 +12,8 @@ Source0:
https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.
# use the library.
Source1: camlimages-2.2.0-htmlref.tar.gz
+Patch1: camlimages-4.2.4-add-g-flag.patch
+
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11, xorg-x11-server-utils
@@ -44,8 +44,9 @@ developing applications using camlimages
Includes documentation provided by ocamldoc
%prep
-%setup -q -n camlspotter-camlimages-7147767b9989
-%setup -q -T -D -a 1 -n camlspotter-camlimages-7147767b9989
+%setup -q -n camlspotter-camlimages-13777ef409e7
+%setup -q -T -D -a 1 -n camlspotter-camlimages-13777ef409e7
+%patch1 -p1
%build
omake CFLAGS="$RPM_OPT_FLAGS"
@@ -64,7 +65,7 @@ cp -pr License.txt htmlref
$RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
%doc README.md License.txt
%{_libdir}/ocaml/camlimages
%exclude %{_libdir}/ocaml/camlimages/*.a
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/camlimages/*.cmxa
%endif
# There aren't any *.cmx files
@@ -77,7 +78,7 @@ cp -pr License.txt htmlref
$RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
%files devel
%{_docdir}/%{name}/htmlref/
%{_libdir}/ocaml/camlimages/*.a
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/camlimages/*.cmxa
%endif
# There aren't any *.cmx files
@@ -86,8 +87,10 @@ cp -pr License.txt htmlref
$RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
%changelog
-* Wed Aug 09 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.2.2-8
-- Bump release and rebuild.
+* Wed Aug 09 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.2.4-1
+- New upstream version 4.2.4.
+- Replace opt test with ocaml_native_compiler.
+- Pass -g option to ocamlopt so debuginfo is generated correctly.
* Tue Aug 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.2.2-7
- OCaml 4.05.0 rebuild.
diff --git a/sources b/sources
index 3bedecb..4bb7b1b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz
-3c4aa0153ca2d91ec2a0798d74648581 4.2.2.tar.gz
+SHA512 (4.2.4.tar.gz) =
fbd132ad1a88ff7d2e5f72190893806f97a08dfe1d8aad9e50f9417701ba6142e36e5e4253962869befda4cc87e96b1e714fbee5a03fbd48cd051d7034bf0ad6
+SHA512 (camlimages-2.2.0-htmlref.tar.gz) =
20cc6b7d92494f2e38700e9c9aed0d9663bed857662037a532241e60a80c5a2dcb308426007c50dfcfbf718098e930fd886ecdc22d5b8c168d08b4f287ab4d02