rpms/ocaml/devel .cvsignore, 1.9, 1.10 ocaml.spec, 1.38, 1.39 sources, 1.11, 1.12
Richard W.M. Jones (rjones)
fedora-extras-commits at redhat.com
Wed Apr 23 08:45:59 UTC 2008
Author: rjones
Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236/devel
Modified Files:
.cvsignore ocaml.spec sources
Log Message:
* Mon Apr 21 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.2-1
- New upstream version 3.10.2 for Fedora 10.
- Cleaned up several rpmlint errors & warnings.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 12 Feb 2008 21:10:04 -0000 1.9
+++ .cvsignore 23 Apr 2008 08:45:19 -0000 1.10
@@ -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
Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ocaml.spec 29 Feb 2008 18:52:45 -0000 1.38
+++ ocaml.spec 23 Apr 2008 08:45:19 -0000 1.39
@@ -1,28 +1,28 @@
-Name: ocaml
-Version: 3.10.1
-Release: 2%{?dist}
-
-Summary: Objective Caml compiler and programming environment
-
-Group: Development/Languages
-License: QPL/LGPL
-URL: http://www.ocaml.org
-Source0: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10.1.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
-Source4: ocaml-find-requires.sh
-Source5: ocaml-find-provides.sh
-Patch0: ocaml-rpath.patch
-Patch1: ocaml-user-cflags.patch
+Name: ocaml
+Version: 3.10.2
+Release: 1%{?dist}
+
+Summary: Objective Caml compiler and programming environment
+
+Group: Development/Languages
+License: QPL and (LGPLv2+ with exceptions)
+URL: http://www.ocaml.org
+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
+Source4: ocaml-find-requires.sh
+Source5: ocaml-find-provides.sh
+Patch0: ocaml-rpath.patch
+Patch1: ocaml-user-cflags.patch
Patch2: ocaml-3.10.0-tclver.patch
-Patch3: ocaml-3.10.1-ppc64.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel
+Patch3: ocaml-3.10.1-ppc64.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ncurses-devel
BuildRequires: gdbm-devel
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel
BuildRequires: tk-devel
-BuildRequires: emacs
+BuildRequires: emacs
BuildRequires: gawk
BuildRequires: perl
BuildRequires: util-linux-ng
@@ -41,9 +41,13 @@
Requires: gcc
Requires: ncurses-devel
Requires: gdbm-devel
-Provides: ocaml(compiler) = %{version}
+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.
@@ -58,7 +62,7 @@
Group: System Environment/Libraries
Summary: Objective Caml runtime environment
Requires: util-linux-ng
-Provides: ocaml(runtime) = %{version}
+Provides: ocaml(runtime) = %{version}
%description runtime
Objective Caml is a high-level, strongly-typed, functional and
@@ -88,9 +92,9 @@
%package labltk
-Group: System Environment/Libraries
-Summary: Tk bindings for Objective Caml
-Requires: ocaml-runtime = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: Tk bindings for Objective Caml
+Requires: ocaml-runtime = %{version}-%{release}
Provides: labltk = %{version}-%{release}
Obsoletes: labltk < %{version}-%{release}
@@ -102,9 +106,9 @@
%package labltk-devel
-Group: Development/Libraries
-Summary: Development files for labltk
-Requires: ocaml = %{version}-%{release}
+Group: Development/Libraries
+Summary: Development files for labltk
+Requires: ocaml = %{version}-%{release}
Requires: %{name}-labltk = %{version}-%{release}
Requires: libX11-devel
Provides: labltk = %{version}-%{release}
@@ -119,9 +123,9 @@
%package camlp4
-Group: Development/Languages
-Summary: Pre-Processor-Pretty-Printer for Objective Caml
-Requires: ocaml-runtime = %{version}-%{release}
+Group: Development/Languages
+Summary: Pre-Processor-Pretty-Printer for Objective Caml
+Requires: ocaml-runtime = %{version}-%{release}
Provides: camlp4 = %{version}-%{release}
Obsoletes: camlp4 < %{version}-%{release}
@@ -133,9 +137,9 @@
%package camlp4-devel
-Group: Development/Languages
-Summary: Pre-Processor-Pretty-Printer for Objective Caml
-Requires: ocaml = %{version}-%{release}
+Group: Development/Languages
+Summary: Pre-Processor-Pretty-Printer for Objective Caml
+Requires: ocaml = %{version}-%{release}
Requires: %{name}-camlp4 = %{version}-%{release}
Provides: camlp4 = %{version}-%{release}
Obsoletes: camlp4 < %{version}-%{release}
@@ -148,29 +152,29 @@
%package ocamldoc
-Group: Development/Languages
-Summary: Documentation generator for Objective Caml.
-Requires: ocaml = %{version}-%{release}
+Group: Development/Languages
+Summary: Documentation generator for Objective Caml.
+Requires: ocaml = %{version}-%{release}
%description ocamldoc
Documentation generator for Objective Caml.
%package emacs
-Group: Development/Languages
-Summary: Emacs mode for Objective Caml
-Requires: ocaml = %{version}-%{release}
-Requires: emacs
+Group: Development/Languages
+Summary: Emacs mode for Objective Caml
+Requires: ocaml = %{version}-%{release}
+Requires: emacs
%description emacs
Emacs mode for Objective Caml.
%package docs
-Group: Development/Languages
-Summary: Documentation for Objective Caml
-Requires: ocaml = %{version}-%{release}
-Requires(post): /sbin/install-info
+Group: Development/Languages
+Summary: Documentation for Objective Caml
+Requires: ocaml = %{version}-%{release}
+Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -193,9 +197,6 @@
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 \
@@ -223,8 +224,8 @@
# install emacs files
cd emacs;
make install \
- BINDIR=$RPM_BUILD_ROOT%{_bindir} \
- EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir}
)
@@ -238,8 +239,8 @@
# 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
@@ -253,7 +254,7 @@
%post docs
/sbin/install-info \
- --entry "* ocaml: (ocaml). The Objective Caml compiler and programming environment" \
+ --entry "* ocaml: (ocaml). The Objective Caml compiler and programming environment" \
--section "Programming Languages" \
%{_infodir}/%{name}.info \
%{_infodir}/dir 2>/dev/null || :
@@ -324,7 +325,7 @@
%{_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 @@
%changelog
+* Mon Apr 21 2008 Richard W.M. Jones <rjones at 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 at infradead.org> - 3.10.1-2
- ppc64 port
@@ -517,7 +522,7 @@
- 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 at bluewin.ch> - 0:3.07-0.fdr.5
@@ -543,4 +548,4 @@
- Rebuilt for Red Hat 9.
* Tue Nov 26 2002 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
-- Added %{_mandir}/mano/* entry
+- Added _mandir/mano/* entry
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Feb 2008 21:10:04 -0000 1.11
+++ sources 23 Apr 2008 08:45:19 -0000 1.12
@@ -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
More information about the scm-commits
mailing list