- New upstream version 3.10.2 for Fedora 10.

- Cleaned up several rpmlint errors & warnings.

.cvsignore

@@ -1,4 +1,4 @@
 ocaml-3.10-refman.html.tar.gz
 ocaml-3.10-refman.info.tar.gz
 ocaml-3.10-refman.pdf
-ocaml-3.10.1.tar.bz2
+ocaml-3.10.2.tar.bz2

ocaml.spec

@@ -1,13 +1,13 @@
 Name:           ocaml
-Version:	3.10.1
-Release: 	2%{?dist}
+Version:        3.10.2
+Release:        1%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
 Group:          Development/Languages
-License:	QPL/LGPL
+License:        QPL and (LGPLv2+ with exceptions)
 URL:            http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10.1.tar.bz2
+Source0:        http://caml.inria.fr/distrib/ocaml-3.10/ocaml-%{version}.tar.bz2
 Source1:        http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.html.tar.gz
 Source2:        http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.pdf
 Source3:        http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.info.tar.gz
@@ -44,6 +44,10 @@ Requires:       gdbm-devel
 Provides:       ocaml(compiler) = %{version}
 ExclusiveArch:  alpha armv4l %{ix86} ia64 x86_64 ppc sparc ppc64
 
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
+
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -193,9 +197,6 @@ man pages and info files.
 
 cp %{SOURCE2} refman.pdf
 
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
-%define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
@@ -238,8 +239,8 @@ cp tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo
 
 # install rpmbuild helper files
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
-cp %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/
-cp %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
+install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/
+install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
@@ -324,7 +325,7 @@ fi
 %{_libdir}/ocaml/threads/*.cmi
 %{_libdir}/ocaml/threads/*.cma
 %{_libdir}/ocaml/fedora-ocaml-release
-%{_prefix}/lib/rpm/*
+%attr(755,root,root) %{_prefix}/lib/rpm/*
 %exclude %{_libdir}/ocaml/graphicsX11.cmi
 %exclude %{_libdir}/ocaml/stublibs/dllgraphics.so
 %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so
@@ -431,6 +432,10 @@ fi
 
 
 %changelog
+* Mon Apr 21 2008 Richard W.M. Jones <rjones@redhat.com> - 3.10.2-1
+- New upstream version 3.10.2 for Fedora 10.
+- Cleaned up several rpmlint errors & warnings.
+
 * Fri Feb 29 2008 David Woodhouse <dwmw2@infradead.org> - 3.10.1-2
 - ppc64 port
 
@@ -517,7 +522,7 @@ fi
 - New Version 3.08.2
 
 * Thu Dec 30 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:3.07-6
-- add -x11lib %%{_prefix}/X11R6/%%{_lib} to configure; fixes labltk build
+- add -x11lib _prefix/X11R6/_lib to configure; fixes labltk build
   on x86_64
 
 * Tue Dec  2 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:3.07-0.fdr.5
@@ -543,4 +548,4 @@ fi
 - Rebuilt for Red Hat 9.
 
 * Tue Nov 26 2002 Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
-- Added %{_mandir}/mano/* entry
+- Added _mandir/mano/* entry

sources

@@ -1,4 +1,4 @@
 663b31c8ea364a531aa325a5b06a2763  ocaml-3.10-refman.html.tar.gz
 f80b52b8bc4b10ed557808fc899acf3a  ocaml-3.10-refman.info.tar.gz
 c3e00bc2c4aad3f538b4bcefade98908  ocaml-3.10-refman.pdf
-15a8c603b34d466329881285438349ef  ocaml-3.10.1.tar.bz2
+d86f8f8aa4574fa60dd6f89044580307  ocaml-3.10.2.tar.bz2