OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1,3 +0,0 @@
-camlimages-2.2.0-htmlref.tar.gz
-camlimages-2.2.0.tgz
-camlimages-3.0.1.tar.gz

.gitignore

@@ -0,0 +1,9 @@
+camlimages-2.2.0-htmlref.tar.gz
+camlimages-2.2.0.tgz
+camlimages-3.0.1.tar.gz
+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
+/4.2.5.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-camlimages
-# $Id$
-NAME := ocaml-camlimages
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

camlimages-3.0.1-display-module.patch

@@ -1,52 +0,0 @@
-diff -ur camlimages-3.0.1.orig/examples/liv/liv.ml camlimages-3.0.1/examples/liv/liv.ml
---- camlimages-3.0.1.orig/examples/liv/liv.ml	2006-09-29 14:21:41.000000000 +0100
-+++ camlimages-3.0.1/examples/liv/liv.ml	2008-11-03 17:18:02.000000000 +0000
-@@ -21,14 +21,14 @@
- 
- open Livmisc;;
- open Gui;;
--open Display;;
-+open Livdisplay;;
- open Tout;;
- 
- open Gc;;
- 
- exception Skipped;;
- 
--let base_filters = ref ([] : Display.filter list);;
-+let base_filters = ref ([] : Livdisplay.filter list);;
- 
- let r = Gc.get () in
- r.max_overhead <- 0; Gc.set r;
-@@ -52,15 +52,15 @@
-   "-root",
-     Arg.String
-       (function
--       | "center" -> Display.root_mode := `CENTER
--       | "random" -> Display.root_mode := `RANDOM
-+       | "center" -> Livdisplay.root_mode := `CENTER
-+       | "random" -> Livdisplay.root_mode := `RANDOM
-        | _ -> raise (Failure "root mode")),
-     ": on root [center|random]";
-   "-transition",
-     Arg.String
-       (function
--       | "myst" -> Display.transition := `MYST
--       | "transparent" -> Display.transition := `TRANSPARENT
-+       | "myst" -> Livdisplay.transition := `MYST
-+       | "transparent" -> Livdisplay.transition := `TRANSPARENT
-        | _ -> raise (Failure "transition")),
-     ": transition [myst|transparent]";
-   "-transparentborder",
-diff -ur camlimages-3.0.1.orig/examples/liv/Makefile.am camlimages-3.0.1/examples/liv/Makefile.am
---- camlimages-3.0.1.orig/examples/liv/Makefile.am	2007-05-21 19:54:32.000000000 +0100
-+++ camlimages-3.0.1/examples/liv/Makefile.am	2008-11-03 17:15:54.000000000 +0000
-@@ -23,7 +23,7 @@
- 	       seq.ml \
- 	       tout.ml \
- 	       enhance.ml \
--	       display.ml \
-+	       livdisplay.ml \
- 	       viewer.ml \
- 	       edge.ml \
- 	       pathfind.ml \

camlimages-4.2.5-add-g-flag.patch

@@ -0,0 +1,24 @@
+diff -ur camlspotter-camlimages-8ca76028cff3.old/OMakefile camlspotter-camlimages-8ca76028cff3/OMakefile
+--- camlspotter-camlimages-8ca76028cff3.old/OMakefile	2017-11-20 10:50:59.000000000 +0000
++++ camlspotter-camlimages-8ca76028cff3/OMakefile	2017-11-22 14:19:46.903902025 +0000
+@@ -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-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string
++OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string -g
+ 
+ # For the development, -warn-error A is turned on
+ if $(file-exists DEV)
+diff -ur camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot camlspotter-camlimages-8ca76028cff3/OMyMakeroot
+--- camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot	2017-11-20 10:50:59.000000000 +0000
++++ camlspotter-camlimages-8ca76028cff3/OMyMakeroot	2017-11-22 14:19:32.461902772 +0000
+@@ -133,7 +133,7 @@
+ OCamlMkLibC(name, files, ldflags) =
+   protected.COBJS=$(addsuffix .o, $(files))
+   dll$(name).so lib$(name).a: $(COBJS)
+-    $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
++    $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
+   return $(array dll$(name).so, lib$(name).a)
+ 
+ # If ocamlmklib does not work for you, you can do:

camlimages-4.2.5-safe-string.patch

@@ -0,0 +1,33 @@
+--- ./camlspotter-camlimages-8ca76028cff3.old/examples/tiffps/tiffps.ml	2017-11-20 10:50:59.000000000 +0000
++++ ./camlspotter-camlimages-8ca76028cff3/examples/tiffps/tiffps.ml	2017-11-22 14:24:13.276888193 +0000
+@@ -58,7 +58,7 @@
+ 
+ (* Scanlined loader *)
+ type scanlined_loader = {
+-    read_next_line: (string -> unit);
++    read_next_line: (bytes -> unit);
+     close: (unit -> unit)
+   }
+ 
+@@ -410,7 +410,7 @@
+             function x ->
+               let adrs = x * 3 in
+               for i = 0 to 2 do
+-                print_string (sprintf "%02x" (Char.code buf.[adrs+i]))
++                print_string (sprintf "%02x" (Char.code (Bytes.get buf (adrs+i))))
+               done
+           else
+             let mono r g b =
+@@ -418,9 +418,9 @@
+             function x ->
+               let adrs = x * 3 in
+               let m =
+-                mono (Char.code buf.[adrs])
+-                     (Char.code buf.[adrs + 1])
+-                     (Char.code buf.[adrs + 2]) in
++                mono (Char.code (Bytes.get buf adrs))
++                     (Char.code (Bytes.get buf (adrs + 1)))
++                     (Char.code (Bytes.get buf (adrs + 2))) in
+               for _i = 0 to 2 do print_string (sprintf "%02x" m) done in
+         if not conf.mirror
+         then for x = x1 to x1 + w - 1 do print_pixel x done

camlimages-oversized-png-check-CVE-2009-2295.patch

@@ -1,81 +0,0 @@
---- camlimages-3.0.1.orig/src/pngread.c	2007-01-18 10:29:57.000000000 +0000
-+++ camlimages-3.0.1.oversized/src/pngread.c	2009-07-03 15:51:00.000000000 +0100
-@@ -15,6 +15,8 @@
- #include "config.h"
- #endif
- 
-+#include <limits.h>
-+
- #include <png.h>
- 
- #include <caml/mlvalues.h>
-@@ -26,6 +28,12 @@
- #define PNG_TAG_INDEX16 2
- #define PNG_TAG_INDEX4 3
- 
-+/* Test if x or y are negative, or if multiplying x * y would cause an
-+ * arithmetic overflow.
-+ */
-+#define oversized(x, y)						\
-+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
-+
- value read_png_file_as_rgb24( name )
-      value name;
- {
-@@ -81,6 +89,9 @@
-   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	       &interlace_type, NULL, NULL);
- 
-+  if (oversized (width, height))
-+    failwith ("png error: image contains oversized or bogus width and height");
-+
-   if ( color_type == PNG_COLOR_TYPE_GRAY ||
-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
-     png_set_gray_to_rgb(png_ptr); 
-@@ -102,10 +113,16 @@
- 
-   rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- 
-+  if (oversized (rowbytes, height))
-+    failwith ("png error: image contains oversized or bogus rowbytes and height");
-+
-   {
-     int i;
-     png_bytep *row_pointers;
- 
-+    if (oversized (sizeof (png_bytep), height))
-+      failwith ("png error: image contains oversized or bogus height");
-+
-     row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height);
- 
-     res = alloc_tuple(3);
-@@ -235,6 +252,9 @@
-   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	       &interlace_type, NULL, NULL);
- 
-+  if (oversized (width, height))
-+    failwith ("png error: image contains oversized or bogus width and height");
-+
-   if ( color_type == PNG_COLOR_TYPE_GRAY ||
-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
-     png_set_gray_to_rgb(png_ptr); 
-@@ -251,6 +271,9 @@
- 
-   rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- 
-+  if (oversized (rowbytes, height))
-+    failwith ("png error: image contains oversized or bogus rowbytes and height");
-+
- /*
- fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr);
- */
-@@ -259,6 +282,9 @@
-     png_bytep *row_pointers;
-     char mesg[256];
-  
-+    if (oversized (sizeof (png_bytep), height))
-+      failwith ("png error: image contains oversized or bogus height");
-+
-     row_pointers = (png_bytep*)stat_alloc(sizeof(png_bytep) * height);
-     res = alloc_tuple(3);
- 

ocaml-camlimages.spec

@@ -1,56 +1,46 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-%define _default_patch_fuzz 2
+# XXX This indicates a bug somewhere.  We are not passing the -g flag
+# through when creating the libraries.  However I cannot see exactly
+# what is wrong.
+%undefine _debugsource_packages
 
 Name:           ocaml-camlimages
-Version:        3.0.1
-Release:        11%{?dist}
+Version:        4.2.5
+Release:        28%{?dist}
 Summary:        OCaml image processing library
-
-Group:          Development/Libraries
 License:        LGPLv2 with exceptions
+
 URL:            http://gallium.inria.fr/camlimages/
-Source0:        http://gallium.inria.fr/camlimages/camlimages-%{version}.tar.gz
+Source0:        https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.gz
+
+# This file isn't published any more (that I could find).
+# It's probably dated but at least should provide some info on how to
+# use the library.
 Source1:        camlimages-2.2.0-htmlref.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
 
-Patch0:         camlimages-3.0.1-display-module.patch
+Patch1:         camlimages-4.2.5-add-g-flag.patch
+# Fix an example which has safe-string problems.
+Patch2:         camlimages-4.2.5-safe-string.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
-Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
-
-BuildRequires:  ocaml >= 3.10.1
+BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-omake
 BuildRequires:  ocaml-lablgtk-devel
-BuildRequires:  ocaml-x11
-BuildRequires:  lablgtk, libpng-devel, libjpeg-devel
-BuildRequires:  libXpm-devel, ghostscript-devel, freetype-devel
+BuildRequires:  rgb
+BuildRequires:  libpng-devel, libjpeg-devel, libexif-devel
+BuildRequires:  libXpm-devel, libgs-devel, freetype-devel
 BuildRequires:  giflib-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  libtool, automake, autoconf
-
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
-
+Requires:       rgb
 
 %description
-CamlImages is an image processing library for Objective CAML, which provides:
-basic functions for image processing and loading/saving, various image file 
-formats (hence providing a translation facility from format to format), 
-and an interface with the Caml graphics library allows to display images 
-in the Graphics module screen and to mix them with Caml drawings
-
-In addition, the library can handle huge images that cannot be (or can hardly
-be) stored into the main memory (the library then automatically creates swap
-files and escapes them to reduce the memory usage).
-
+This is an image processing library, which provides some basic
+functions of image processing and loading/saving various image file
+formats. In addition the library can handle huge images that cannot be
+(or can hardly be) stored into the memory (the library automatically
+creates swap files and escapes them to reduce the memory usage).
 
 %package        devel
 Summary:        Development files for camlimages
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release} 
+Requires:       %{name}%{?_isa} = %{version}-%{release} 
 
 
 %description    devel
@@ -59,137 +49,262 @@ developing applications using camlimages
 
 Includes documentation provided by ocamldoc
 
-
 %prep
-%setup -q -n camlimages-%{version} -a 1
-
-# Gdk.Display submodule clashes with the Display module in
-# the examples/liv directory, so rename it:
-%patch0 -p1
+%setup -q -n camlspotter-camlimages-8ca76028cff3
+%setup -q -T -D -a 1 -n camlspotter-camlimages-8ca76028cff3
 %patch1 -p1
-aclocal -I .
-automake
-autoconf
-mv examples/liv/display.ml examples/liv/livdisplay.ml
-
+%patch2 -p2
 
 %build
-%configure
-make
-
+omake CFLAGS="$RPM_OPT_FLAGS" --verbose
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install ocamlsitelibdir=%{_libdir}/ocaml/camlimages DESTDIR=$RPM_BUILD_ROOT
-
-strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllcamlimages.so
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# These rules work if the library uses 'ocamlfind install' to install itself.
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+omake install
 
+mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
+cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
 
 %files
-%defattr(-,root,root,-)
-%doc INSTALL README
+%doc README.md License.txt
 %{_libdir}/ocaml/camlimages
-%{_libdir}/ocaml/stublibs/*.so
-%if %opt
 %exclude %{_libdir}/ocaml/camlimages/*.a
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/camlimages/*.cmxa
 %endif
+# There aren't any *.cmx files
+#%exclude %{_libdir}/ocaml/camlimages/*.cmx
 %exclude %{_libdir}/ocaml/camlimages/*.mli
+%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so.owner
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc doc/*.{html,jpg}
-%if %opt
+%{_docdir}/%{name}/htmlref/
 %{_libdir}/ocaml/camlimages/*.a
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/camlimages/*.cmxa
 %endif
+# There aren't any *.cmx files
+#%{_libdir}/ocaml/camlimages/*.cmx
 %{_libdir}/ocaml/camlimages/*.mli
 
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Mar  1 19:41:31 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-28
+- OCaml 4.12.0 build
 
-* Fri Jul  3 2009 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-10
-- ocaml-camlimages: PNG reader multiple integer overflows
-  (CVE 2009-2295 / RHBZ#509531).
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Sat May 23 2009 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-8
-- Rebuild for OCaml 3.11.1
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-26
+- OCaml 4.11.1 rebuild
 
-* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
-- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
-  (added sparc64 per request from the sparc maintainer)
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-25
+- OCaml 4.11.0 rebuild
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 4.2.5-24
+- {Build,}Require rgb not xorg-x11-server-utils
 
-* Sat Feb  7 2009 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-6
-- Rebuild against updated lablgtk.
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Fri Dec  5 2008 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-5
-- Rebuild.
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-22
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
 
-* Thu Dec  4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-4
-- Rebuild.
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-21
+- OCaml 4.11.0 pre-release attempt 2
 
-* Mon Nov  3 2008 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-3
-- +BR gtk2-devel.
-- +BR ocaml-x11.
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-20
+- OCaml 4.11.0 pre-release
 
-* Mon Nov  3 2008 Richard W.M. Jones <rjones@redhat.com> - 3.0.1-1
-- Home page moved (fixes rhbz 468158).
-- New upstream version 3.0.1 and multiple build fixes for this.
-- License is really LGPLv2 with the OCaml linking exception.
-- Removed the DESTDIR patch.
-- Build tiff support.
-- Run it through rpmlint and fix all problems.
+* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-19
+- Update all OCaml dependencies for RPM 4.16.
 
-* Thu Aug 28 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-13
-- Rebuild with patch fuzz.
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-18
+- OCaml 4.10.0 final.
 
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.0-12
-- fix license tag
+* Thu Feb 06 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-17
+- Remove bogus "lablgtk" dependency.
 
-* Wed Apr 23 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-11
-- Rebuild for OCaml 3.10.2
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Sat Mar  1 2008 Richard W.M. Jones <rjones@redhat.com> 2.2.0-10
-- Rebuild for ppc64.
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-15
+- OCaml 4.10.0+beta1 rebuild.
 
-* Wed Feb 13 2008 Richard W.M. Jones <rjones@redhat.com> 2.2.0-9
-- Rebuild for OCaml 3.10.1
-- Fix paths to conform to packaging policy.
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-14
+- OCaml 4.09.0 for riscv64
 
-* Wed May 09 2007 Nigel Jones <dev@nigelj.com> 2.2.0-8
-- Exclude ppc64 builds due to missing ocaml
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-13
+- OCaml 4.09.0 (final) rebuild.
 
-* Fri May 04 2007 Nigel Jones <dev@nigelj.com> 2.2.0-7
-- Change to Makefile patch to move .so files to stublibs
-- Rename to ocaml-camlimages
-- Other changes per review
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-12
+- OCaml 4.08.1 (final) rebuild.
 
-* Thu May 03 2007 Nigel Jones <dev@nigelj.com> 2.2.0-6
-- Include .*a files just to make sure
+* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-11
+- Rebuild against new ocaml-lablgtk.
 
-* Thu May 03 2007 Nigel Jones <dev@nigelj.com> 2.2.0-5
-- Revert -4 changes
-- Remove excludedirs patch, replace with a sed
-- Provide html documentation generated from running ocaml-ocamldoc
+* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-10
+- OCaml 4.08.1 (rc2) rebuild.
 
-* Thu Apr 26 2007 Nigel Jones <dev@nigelj.com> 2.2.0-4
-- Add Provides: camlimages-static, and LICENSE to -devel docs
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Thu Apr 12 2007 Nigel Jones <dev@nigelj.com> 2.2.0-3
-- Remove .a & .o files
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Wed Apr 11 2007 Nigel Jones <dev@nigelj.com> 2.2.0-2
-- Add missing dependencies
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Tue Apr 10 2007 Nigel Jones <dev@nigelj.com> 2.2.0-1
-- Initial spec file
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-6
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-5
+- OCaml 4.07.0-rc1 rebuild.
+
+* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 4.2.5-4
+- Rebuild (giflib)
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.5-3
+- Escape macros in %%changelog
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-1
+- New upstream version 4.2.5.
+- New version fixes compatibility with latest lablgtk.
+
+* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-2
+- OCaml 4.06.0 rebuild.
+
+* Wed Aug 09 2017 Richard W.M. Jones <rjones@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@redhat.com> - 4.2.2-7
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-4
+- OCaml 4.04.2 rebuild.
+
+* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-3
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-1
+- New upstream version 4.2.2.
+- Drop patch for exif handling which is included upstream.
+- Drop patch for warn-error since this is fixed upstream.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Aug 16 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-18
+- devel shouldn't cover all doc files
+
+* Tue Aug 11 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-17
+- Don't use %%doc to copy over htmlref for -devel package
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-16
+- Bump release and rebuild.
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-15
+- OCaml 4.02.3 rebuild.
+
+* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-14
+- Enable bytecode compilation.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-13
+- ocaml-4.02.2 final rebuild.
+
+* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-12
+- ocaml-4.02.2 rebuild.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-10
+- ocaml-4.02.1 rebuild.
+
+* Fri Oct 31 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-9
+- Rebuild to link with updated dependencies
+
+* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-8
+- ocaml-4.02.0 final rebuild.
+
+* Tue Aug 19 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-7
+- Kill -warn-error A so we can build on OCaml 4.02.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 15 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-5
+- Rebuild for ocaml update
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Dec 25 2013 Ville Skyttä <ville.skytta@iki.fi> - 4.1.0-3
+- Fix -debuginfo, enable exif and rgb.txt support (#1009155).
+
+* Fri Sep 27 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-2
+- Try to get actual debug output
+
+* Sun Sep 15 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-1
+- Update to 4.1.0
+- Enable debug output
+- Patch for recent libpng is no longer needed
+
+* Sat Sep 14 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-13
+- Rebuild for OCaml 4.01.0
+
+* Sun Aug 11 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-12
+- Move to unversioned doc directory
+- Fixes FTBFS bug 992390
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 4.0.1-9
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 4.0.1-8
+- rebuild against new libjpeg
+
+* Wed Oct 17 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-7
+- Rebuild for ocaml 4.0.1
+
+* Sun Jul 29 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-6
+- Rebuild for ocaml 4.0.0 final
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jun 08 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-4
+- Rebuild for new ocaml
+
+* Fri May 11 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-3
+- Rebuild for new libtiff
+
+* Sat Mar 10 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-2
+- Fixup "should fixes" from review
+
+* Sun Jan 29 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-1
+- Resurrect ocaml-camlimages

sources

@@ -1,2 +1,2 @@
-fb1633c9c8df0b2b2d0f892d8c4ac2ee  camlimages-2.2.0-htmlref.tar.gz
-ecacc0ecac17b5b9af1da97f68a814a0  camlimages-3.0.1.tar.gz
+SHA512 (camlimages-2.2.0-htmlref.tar.gz) = 20cc6b7d92494f2e38700e9c9aed0d9663bed857662037a532241e60a80c5a2dcb308426007c50dfcfbf718098e930fd886ecdc22d5b8c168d08b4f287ab4d02
+SHA512 (4.2.5.tar.gz) = 8ca5f4f9c49dc2ad86dac3da640422f45816f510ace5fba975eda0046e4973b624d13022b50a4d5f93d425d0fe1e126ca7a008f3421b8383f43ca7c27442bceb