From a57cff48a40ae0ef6d81e6a55ec20dbc075394bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 25 Dec 2013 13:07:25 +0200 Subject: [PATCH] Fix -debuginfo, enable exif and rgb.txt support (#1009155). --- ocaml-camlimages-4.1.0-exifcheck.patch | 12 ++++++++++++ ocaml-camlimages.spec | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 ocaml-camlimages-4.1.0-exifcheck.patch diff --git a/ocaml-camlimages-4.1.0-exifcheck.patch b/ocaml-camlimages-4.1.0-exifcheck.patch new file mode 100644 index 0000000..369f956 --- /dev/null +++ b/ocaml-camlimages-4.1.0-exifcheck.patch @@ -0,0 +1,12 @@ +diff -up camlspotter-camlimages-668faa3494fe/OMakefile~ camlspotter-camlimages-668faa3494fe/OMakefile +--- camlspotter-camlimages-668faa3494fe/OMakefile~ 2013-07-09 08:48:13.000000000 +0300 ++++ camlspotter-camlimages-668faa3494fe/OMakefile 2013-12-25 13:00:58.554662373 +0200 +@@ -172,7 +172,7 @@ failwith_if_defined(var, msg) = + HAVE_EXIF= + LDFLAGS_exif= + if $(true_if_not_defined ARG_WANT_EXIF) +- HAVE_EXIF = $(Check_header_library exif, exif-data.h, exif_data_load_data) ++ HAVE_EXIF = $(Check_header_library exif, libexif/exif-data.h, exif_data_load_data) + SUPPORT_EXIF = $(HAVE_EXIF) + if $(SUPPORT_EXIF) + LDFLAGS_exif=-lexif diff --git a/ocaml-camlimages.spec b/ocaml-camlimages.spec index 1acd2c1..c83eb02 100644 --- a/ocaml-camlimages.spec +++ b/ocaml-camlimages.spec @@ -1,6 +1,6 @@ Name: ocaml-camlimages Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -14,14 +14,18 @@ Source0: https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar. # use the library. Source1: camlimages-2.2.0-htmlref.tar.gz +# https://bitbucket.org/camlspotter/camlimages/issue/9 +Patch0: ocaml-camlimages-4.1.0-exifcheck.patch + BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake BuildRequires: ocaml-lablgtk-devel -BuildRequires: ocaml-x11 -BuildRequires: lablgtk, libpng-devel, libjpeg-devel +BuildRequires: ocaml-x11, xorg-x11-server-utils +BuildRequires: lablgtk, libpng-devel, libjpeg-devel, libexif-devel BuildRequires: libXpm-devel, ghostscript-devel, freetype-devel BuildRequires: giflib-devel BuildRequires: libtiff-devel BuildRequires: gtk2-devel +Requires: xorg-x11-server-utils %description This is an image processing library, which provides some basic @@ -45,11 +49,10 @@ Includes documentation provided by ocamldoc %prep %setup -q -n camlspotter-camlimages-668faa3494fe %setup -q -T -D -a 1 -n camlspotter-camlimages-668faa3494fe +%patch0 -p1 %build -# Turn on debugging -export OCAMLCFLAGS="$OCAMLCFLAGS +g" -omake +omake CFLAGS="$RPM_OPT_FLAGS" %install # These rules work if the library uses 'ocamlfind install' to install itself. @@ -83,6 +86,9 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages %changelog +* Wed Dec 25 2013 Ville Skyttä - 4.1.0-3 +- Fix -debuginfo, enable exif and rgb.txt support (#1009155). + * Fri Sep 27 2013 Bruno Wolff III - 4.1.0-2 - Try to get actual debug output