Rename the mingw32-ocaml package and rebuild all dependent libraries.

diff --git a/.hgignore b/.hgignore
index 118df8f..74b413c 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -91,6 +91,7 @@ ocaml-curses/test1
 ocaml-extlib/extlib-1.5.1.tar.gz
 ocaml-extlib/test1
 ocaml-findlib/findlib-1.2.2.tar.gz
+ocaml-findlib/findlib-1.2.3.tar.gz
 ocaml-lablgl/lablgl-1.03.tar.gz
 ocaml-libvirt/ocaml-libvirt-0.4.4.2.tar.gz
 ocaml-xml-light/xml-light-2.2.cvs20070817.tar.gz

diff --git a/ocaml-calendar/mingw32-ocaml-calendar.spec b/ocaml-calendar/mingw32-ocaml-calendar.spec
index 9f3db08..43b40c3 100644 (file)
--- a/ocaml-calendar/mingw32-ocaml-calendar.spec
+++ b/ocaml-calendar/mingw32-ocaml-calendar.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-calendar
 Version:        2.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows OCaml library for managing dates and times
 
 License:        LGPLv2+
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  mingw32-ocaml-findlib >= 1.2.2-7
 
 
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-4
+- Rebuild with newly named mingw32-ocaml cross-compiler.
+
 * Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-3
 - Override ocamlc.opt, ocamlopt.opt in case a compatible native
   compiler is also installed.

diff --git a/ocaml-csv/mingw32-ocaml-csv.spec b/ocaml-csv/mingw32-ocaml-csv.spec
index db71636..1f4cbb0 100644 (file)
--- a/ocaml-csv/mingw32-ocaml-csv.spec
+++ b/ocaml-csv/mingw32-ocaml-csv.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-csv
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows OCaml library for reading and writing CSV files
 
 License:        LGPLv2+
@@ -25,7 +25,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  mingw32-ocaml-extlib
 
 
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.1.7-3
+- Rebuild with latest OCaml cross-compiler.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.1.7-2
 - Force rebuild with latest OCaml compiler.
 

diff --git a/ocaml-curses/mingw32-ocaml-curses.spec b/ocaml-curses/mingw32-ocaml-curses.spec
index 6a68552..2b751e8 100644 (file)
--- a/ocaml-curses/mingw32-ocaml-curses.spec
+++ b/ocaml-curses/mingw32-ocaml-curses.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-curses
 Version:        1.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows OCaml bindings for ncurses
 
 License:        LGPLv2+
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  mingw32-ocaml-findlib
 BuildRequires:  mingw32-pdcurses
 
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-4
+- Rebuild against newest OCaml cross-compiler.
+
 * Sat Nov 22 2008 Richard W.M. Jones <rjones@redhat.com> - 1.0.3-3
 - Rebuild against new pdcurses.
 

diff --git a/ocaml-extlib/mingw32-ocaml-extlib.spec b/ocaml-extlib/mingw32-ocaml-extlib.spec
index 44d4652..c76d3e5 100644 (file)
--- a/ocaml-extlib/mingw32-ocaml-extlib.spec
+++ b/ocaml-extlib/mingw32-ocaml-extlib.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-extlib
 Version:        1.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows port of OCaml ExtLib
 
 License:        LGPLv2+ with exceptions
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-2
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 
 
 %description
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-3
+- Rebuild with latest OCaml cross-compiler.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-2
 - Force rebuild against latest OCaml compiler.
 

diff --git a/ocaml-findlib/mingw32-ocaml-findlib.spec b/ocaml-findlib/mingw32-ocaml-findlib.spec
index 0d36119..84a1927 100644 (file)
--- a/ocaml-findlib/mingw32-ocaml-findlib.spec
+++ b/ocaml-findlib/mingw32-ocaml-findlib.spec
@@ -17,8 +17,8 @@
 #   ocamlfind cmd ...
 
 Name:           mingw32-ocaml-findlib
-Version:        1.2.2
-Release:        8%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        MinGW Windows Objective CAML package manager and build helper
 
 License:        BSD
@@ -37,7 +37,7 @@ BuildRequires:  mingw32-binutils
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  m4
 BuildRequires:  gawk
 
@@ -136,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1
+- New upstream release 1.2.3.
+- Rebuild against the latest OCaml cross-compiler.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-8
 - Force rebuild against latest OCaml compiler.
 

diff --git a/ocaml-lablgl/mingw32-ocaml-lablgl.spec b/ocaml-lablgl/mingw32-ocaml-lablgl.spec
index b4c9d5a..86f426d 100644 (file)
--- a/ocaml-lablgl/mingw32-ocaml-lablgl.spec
+++ b/ocaml-lablgl/mingw32-ocaml-lablgl.spec
@@ -25,10 +25,7 @@ BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
-BuildRequires:  mingw32-ocaml
-
-# XXX This requires camlp4 which we don't yet have under MinGW.
-BuildRequires:  mingw32-ocaml-camlp4
+BuildRequires:  mingw32-ocaml >= 3.11.0
 
 # labltk is used by the native package, but is essentially optional.
 #BuildRequires: mingw32-ocaml-labtk
@@ -96,5 +93,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Nov 13 2008 Your Name <you@example.com> - 1.2.3-1
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.03-1
 - Initial RPM release.

diff --git a/ocaml-libvirt/mingw32-ocaml-libvirt.spec b/ocaml-libvirt/mingw32-ocaml-libvirt.spec
index bd3f49f..07a43f0 100644 (file)
--- a/ocaml-libvirt/mingw32-ocaml-libvirt.spec
+++ b/ocaml-libvirt/mingw32-ocaml-libvirt.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-libvirt
 Version:        0.4.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows port of OCaml binding for libvirt
 
 License:        LGPLv2+
@@ -23,7 +23,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-13
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  mingw32-ocaml-findlib
 BuildRequires:  mingw32-libvirt >= 0.2.1
 BuildRequires:  perl
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4.2-3
+- Rebuild against latest OCaml cross-compiler.
+
 * Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4.2-2
 - Requires mingw32-libvirt package.
 

diff --git a/ocaml-xml-light/mingw32-ocaml-xml-light.spec b/ocaml-xml-light/mingw32-ocaml-xml-light.spec
index 91f86ba..1658f6e 100644 (file)
--- a/ocaml-xml-light/mingw32-ocaml-xml-light.spec
+++ b/ocaml-xml-light/mingw32-ocaml-xml-light.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-xml-light
 Version:        2.2.cvs20070817
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows minimal XML parser and printer for OCaml
 
 License:        LGPLv2+
@@ -24,7 +24,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 
 
 %description
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2cvs20070817-3
+- Rebuild against latest OCaml cross-compiler.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 2.2cvs20070817-2
 - Force rebuild against latest OCaml compiler.
 

diff --git a/ocaml/mingw32-ocaml.spec b/ocaml/mingw32-ocaml.spec
index 1cf7874..d9c0d5b 100644 (file)
--- a/ocaml/mingw32-ocaml.spec
+++ b/ocaml/mingw32-ocaml.spec
@@ -7,15 +7,15 @@
 %define otherlibraries win32unix str num dynlink bigarray systhreads win32graph
 
 Name:           mingw32-ocaml
-Version:        3.11.0+beta1
-Release:        14%{?dist}
+Version:        3.11.0
+Release:        0.15.beta1%{?dist}
 Summary:        Objective Caml MinGW cross-compiler and programming environment
 
 License:        QPL and (LGPLv2+ with exceptions)
 Group:          Development/Libraries
 
 URL:            http://caml.inria.fr/
-Source0:        http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-%{version}.tar.bz2
+Source0:        http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-%{version}+beta1.tar.bz2
 
 # This is installed as config/Makefile when we cross-compile.
 Source1000:     Makefile-fedora-mingw.in
@@ -51,10 +51,16 @@ BuildRequires:  /lib/libgcc_s.so.1
 BuildRequires:  /usr/lib/crt1.o
 BuildRequires:  /usr/lib/libX11.so
 
-# While we still ship bytecode, this requires a /usr/bin/ocamlrun from
-# the _identical_ native package.  We don't have that at the moment,
-# which is why this is commented out.
-#Requires:       ocaml-runtime = %{version}
+# We need the native Fedora OCaml package (of the precise matching
+# version) for several reasons:
+# (a) We need /usr/bin/ocamlrun (the bytecode interpreter) in order
+# to run our bytecodes such as i686-pc-mingw32-ocamlopt.  Eventually
+# shipping native versions of the cross-compiler binaries should
+# resolve this.
+# (b) We need camlp4 preprocessor, and because of the way this works
+# it has to be the camlp4 from the identical version.
+Requires:       ocaml-runtime = %{version}
+Requires:       ocaml-camlp4-devel = %{version}
 
 # The built program will try to run the cross-compiler and flexdll, so
 # these must be runtime requires.
@@ -76,7 +82,7 @@ and produces Windows native executables.
 
 
 %prep
-%setup -q -n ocaml-%{version}
+%setup -q -n ocaml-%{version}+beta1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -188,25 +194,16 @@ install -m 0755 ocamlc $RPM_BUILD_ROOT%{_bindir}
 cp config/Makefile \
    $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/Makefile.config
 
-# For bytecode binaries, change the bang-path to point to the locally
-# installed ocamlrun.
-pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlopt ocamlprof; do
-  mv $f $f.old
-  echo '#!%{_bindir}/%{_mingw32_target}-ocamlrun' > $f
-  tail -n +2 $f.old >> $f
-  chmod +x $f
-  rm $f.old
-done
-popd
-
 # Rename all the binaries to target-binary.
 pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof ocamlrun; do
+for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do
   mv $f %{_mingw32_target}-$f
 done
 popd
 
+# Don't install ocamlrun, use native one.
+rm $RPM_BUILD_ROOT%{_bindir}/ocamlrun
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -222,11 +219,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{_mingw32_target}-ocamlmktop
 %{_bindir}/%{_mingw32_target}-ocamlprof
 %{_bindir}/%{_mingw32_target}-ocamlopt
-%{_bindir}/%{_mingw32_target}-ocamlrun
 %{_libdir}/%{_mingw32_target}-ocaml/
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0-0.15.beta1
+- Use the proper package naming convention, since '+' etc shouldn't be
+  in the name, as per Fedora packaging guidelines.  Note that this won't
+  upgrade smoothly, but we don't care because these packages aren't
+  officially released yet.  You'll just have to uninstall the old
+  package and install the new one.
+- Don't ship our own ocamlrun, use the native one instead.
+- Require camlp4 utilities.
+
 * Mon Nov 17 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-14
 - Added README.Fedora.