Author: rjones
Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6379
Modified Files:
.cvsignore ocaml-camlimages.spec sources
Added Files:
camlimages-3.0.2-display-module.patch
Removed Files:
camlimages-3.0.1-display-module.patch
Log Message:
* Tue Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-1
- New upstream version 3.0.2.
- Fix URL and source URL.
- Rebase Display->Livdisplay patch.
- Remove png check CVE patch (now upstream).
- RETAIN tiff check CVE patch (NOT upstream).
- Replace %%define with %%global.
- Use upstream RPM 4.8 OCaml dependency generator.
- Fix configure.ac, also we now BR ocaml-autoconf.
camlimages-3.0.2-display-module.patch:
camlimages-3.0.1/examples/liv/Makefile.am | 2 +-
examples/liv/liv.ml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE camlimages-3.0.2-display-module.patch ---
--- camlimages-3.0.2/examples/liv/liv.ml 2009-10-26 12:42:03.000000000 +0000
+++ camlimages-3.0.2.display/examples/liv/liv.ml 2010-01-12 15:13:21.414300958 +0000
@@ -19,7 +19,7 @@
;;
*)
-module D = Display
+module D = Livdisplay
open D
open Gc
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 \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 Nov 2008 17:49:30 -0000 1.3
+++ .cvsignore 12 Jan 2010 15:29:30 -0000 1.4
@@ -1,3 +1,4 @@
camlimages-2.2.0-htmlref.tar.gz
camlimages-2.2.0.tgz
camlimages-3.0.1.tar.gz
+camlimages-3.0.2.tgz
Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ocaml-camlimages.spec 30 Dec 2009 13:48:10 -0000 1.23
+++ ocaml-camlimages.spec 12 Jan 2010 15:29:30 -0000 1.24
@@ -1,28 +1,35 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-%define _default_patch_fuzz 2
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
+%global _default_patch_fuzz 2
Name: ocaml-camlimages
-Version: 3.0.1
-Release: 15%{?dist}
+Version: 3.0.2
+Release: 1%{?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
+URL: http://cristal.inria.fr/camlimages/eng.html
+Source0: http://cristal.inria.fr/camlimages/camlimages-%{version}.tgz
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
+Patch0: camlimages-3.0.2-display-module.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
-Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch
+# Now upstream in 3.0.2.
+#Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+# NOT upstream in 3.0.2.
Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch
+# This is paradoxically only needed because we are rerunning aclocal
+# which will use the new ocaml-autoconf that has slightly different
+# macros.
+Patch3: camlimages-3.0.2-ocaml-autoconf.patch
+
BuildRequires: ocaml >= 3.10.1
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11
@@ -32,10 +39,7 @@ 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
+BuildRequires: ocaml-autoconf
%description
@@ -69,8 +73,8 @@ Includes documentation provided by ocaml
# Gdk.Display submodule clashes with the Display module in
# the examples/liv directory, so rename it:
%patch0 -p1
-%patch1 -p1
%patch2 -p1
+%patch3 -p1
aclocal -I .
automake
autoconf
@@ -116,6 +120,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-1
+- New upstream version 3.0.2.
+- Fix URL and source URL.
+- Rebase Display->Livdisplay patch.
+- Remove png check CVE patch (now upstream).
+- RETAIN tiff check CVE patch (NOT upstream).
+- Replace %%define with %%global.
+- Use upstream RPM 4.8 OCaml dependency generator.
+- Fix configure.ac, also we now BR ocaml-autoconf.
+
* Wed Dec 30 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.1-15
- Rebuild for OCaml 3.11.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Nov 2008 17:49:30 -0000 1.3
+++ sources 12 Jan 2010 15:29:30 -0000 1.4
@@ -1,2 +1,2 @@
fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz
-ecacc0ecac17b5b9af1da97f68a814a0 camlimages-3.0.1.tar.gz
+ccb2551232df255f6306941d26d07615 camlimages-3.0.2.tgz
--- camlimages-3.0.1-display-module.patch DELETED ---
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
