rpms/ocaml-bitstring/F-8 import.log, NONE, 1.1 ocaml-bitstring-3.10.0.patch, NONE, 1.1 ocaml-bitstring.spec, 1.1, 1.2

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bitstring/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182/F-8

Modified Files:
	ocaml-bitstring.spec 
Added Files:
	import.log ocaml-bitstring-3.10.0.patch 
Log Message:
* Thu Jul 17 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.7-2
- ExcludeArch ppc64 (only needed for F-8).
- Patch to work around a bug in old camlp4 on this branch.



--- NEW FILE import.log ---
ocaml-bitstring-1_9_7-2_fc8:F-8:ocaml-bitstring-1.9.7-2.fc8.src.rpm:1216322397

ocaml-bitstring-3.10.0.patch:

--- NEW FILE ocaml-bitstring-3.10.0.patch ---
diff -ur ocaml-bitstring-1.9.7.orig/pa_bitstring.ml ocaml-bitstring-1.9.7/pa_bitstring.ml
--- ocaml-bitstring-1.9.7.orig/pa_bitstring.ml	2008-07-17 16:45:58.000000000 +0100
+++ ocaml-bitstring-1.9.7/pa_bitstring.ml	2008-07-17 20:16:20.000000000 +0100
@@ -55,9 +55,9 @@
     (match expr_is_constant a, expr_is_constant b with
      | Some a, Some b ->	       (* Integer binary operations. *)
          let ops = ["+", (+); "-", (-); "*", ( * ); "/", (/);
-                    "land", (land); "lor", (lor); "lxor", (lxor);
+                    (*"land", (land); "lor", (lor); "lxor", (lxor);
                     "lsl", (lsl); "lsr", (lsr); "asr", (asr);
-		    "mod", (mod)] in
+		    "mod", (mod) *)] in
          (try Some ((List.assoc op ops) a b) with Not_found -> None)
      | _ -> None)
   | _ -> None


Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/F-8/ocaml-bitstring.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-bitstring.spec	17 Jul 2008 19:01:44 -0000	1.1
+++ ocaml-bitstring.spec	17 Jul 2008 19:27:51 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:           ocaml-bitstring
 Version:        1.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
 Group:          Development/Libraries
@@ -20,6 +20,11 @@
 Source0:        http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+ExcludeArch:    ppc64
+
+# Patch required because of buggy old version of camlp4.
+Patch0:         ocaml-bitstring-3.10.0.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -82,6 +87,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Keep a pristine copy of the examples directory for distribution.
 cp -a examples bitstring-examples
@@ -170,6 +176,10 @@
 
 
 %changelog
+* Thu Jul 17 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.7-2
+- ExcludeArch ppc64 (only needed for F-8).
+- Patch to work around a bug in old camlp4 on this branch.
+
 * Thu Jul 17 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.7-1
 - New upstream release 1.9.7.
 - Project renamed from ocaml-bitmatch to ocaml-bitstring.