New upstream version 4.2.2.

This commit is contained in:
Richard W.M. Jones 2016-11-05 09:57:37 +00:00
parent e9a166363f
commit 6f36366739
5 changed files with 13 additions and 40 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ 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

View File

@ -1,12 +0,0 @@
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

View File

@ -1,11 +0,0 @@
--- camlspotter-camlimages-668faa3494fe.old/OMakefile 2014-08-19 18:37:14.405009781 +0100
+++ camlspotter-camlimages-668faa3494fe/OMakefile 2014-08-19 18:37:55.930019935 +0100
@@ -12,6 +12,8 @@
# #
#*********************************************************************#
+OCAMLFLAGS =
+
include OMyMakeroot
########################################## External arguments

View File

@ -1,14 +1,12 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
Name: ocaml-camlimages
Version: 4.1.0
Release: 19%{?dist}
Version: 4.2.2
Release: 1%{?dist}
Summary: OCaml image processing library
Group: Development/Libraries
License: LGPLv2 with exceptions
URL: http://cristal.inria.fr/camlimages/eng.html
URL: http://gallium.inria.fr/camlimages/
Source0: https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.gz
# This file isn't published any more (that I could find).
@ -16,12 +14,6 @@ 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
# Kill -warn-error A so we can build on OCaml 4.02.
Patch1: ocaml-camlimages-4.1.0-kill-warn-error.patch
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11, xorg-x11-server-utils
@ -52,10 +44,8 @@ developing applications using camlimages
Includes documentation provided by ocamldoc
%prep
%setup -q -n camlspotter-camlimages-668faa3494fe
%setup -q -T -D -a 1 -n camlspotter-camlimages-668faa3494fe
%patch0 -p1
%patch1 -p1
%setup -q -n camlspotter-camlimages-7147767b9989
%setup -q -T -D -a 1 -n camlspotter-camlimages-7147767b9989
%build
omake CFLAGS="$RPM_OPT_FLAGS"
@ -71,7 +61,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
%files
%doc README License.txt
%doc README.md License.txt
%{_libdir}/ocaml/camlimages
%exclude %{_libdir}/ocaml/camlimages/*.a
%if %{opt}
@ -96,6 +86,11 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
%changelog
* 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

View File

@ -1,2 +1,2 @@
fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz
6c11c9290a4f6fb55ec7c7577520ddc2 4.1.0.tar.gz
3c4aa0153ca2d91ec2a0798d74648581 4.2.2.tar.gz