rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.9,1.10

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bitmatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585

Modified Files:
	ocaml-bitmatch.spec 
Log Message:
+* Tue Jul  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.2-4
+- Don't build CIL tools unless we have CIL.



Index: ocaml-bitmatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-bitmatch.spec	1 Jul 2008 14:37:32 -0000	1.9
+++ ocaml-bitmatch.spec	1 Jul 2008 14:47:45 -0000	1.10
@@ -1,9 +1,21 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+# Don't have CIL on ppc & ppc64 so we cannot build the C tools.
+# See: bz#435546 bz#435545
+%ifarch ppc
+%define build_cil_tools 0
+%else
+%ifarch ppc64
+%define build_cil_tools 0
+%else
+%define build_cil_tools 1
+%endif
+%endif
+
 Name:           ocaml-bitmatch
 Version:        1.9.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
 Group:          Development/Libraries
@@ -16,8 +28,10 @@
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
+%if %build_cil_tools
 BuildRequires:  ocaml-cil-devel
 BuildRequires:  ocaml-extlib-devel
+%endif
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
@@ -42,6 +56,7 @@
 developing applications that use %{name}.
 
 
+%if %build_cil_tools
 %package        c
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -51,6 +66,7 @@
 %description    c
 The %{name}-cil package contains tools for importing structs
 from C code and header files into %{name}.
+%endif
 
 
 %prep
@@ -82,6 +98,7 @@
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
+%if %build_cil_tools
 # Install bitmatch-import-c by hand for now.
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 %if %opt
@@ -92,6 +109,7 @@
 
 # Install bitmatch-import-prefix.h by hand for now.
 install -m 0644 cil-tools/bitmatch-import-prefix.h $OCAMLFIND_DESTDIR/bitmatch/
+%endif
 
 
 %clean
@@ -122,13 +140,19 @@
 %{_libdir}/ocaml/bitmatch/*.mli
 
 
+%if %build_cil_tools
 %files c
 %defattr(-,root,root,-)
 %doc COPYING.LIB cil-tools/ext3.c cil-tools/ext3.ml cil-tools/task_struct.c cil-tools/task_struct.ml
 %{_bindir}/bitmatch-import-c
 %exclude %{_libdir}/ocaml/bitmatch/*.h
+%endif
+
 
 %changelog
+* Tue Jul  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.2-4
+- Don't build CIL tools unless we have CIL.
+
 * Tue Jul  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.2-3
 - +BR ocaml-extlib-devel.