rpms/ocaml-bitmatch/devel ocaml-bitmatch.spec,1.6,1.7

[Richard W.M. Jones (rjones)]

Author: rjones

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

Modified Files:
	ocaml-bitmatch.spec 
Log Message:
* Tue Jul  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.2-1
- New upstream release 1.9.2.
- Include C tools (requiring CIL) in a separate subpackage.



Index: ocaml-bitmatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitmatch/devel/ocaml-bitmatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-bitmatch.spec	21 May 2008 09:47:33 -0000	1.6
+++ ocaml-bitmatch.spec	1 Jul 2008 14:22:45 -0000	1.7
@@ -2,7 +2,7 @@
 %define debug_package %{nil}
 
 Name:           ocaml-bitmatch
-Version:        1.3
+Version:        1.9.2
 Release:        1%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
@@ -16,6 +16,7 @@
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-cil-devel
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
@@ -40,6 +41,17 @@
 developing applications that use %{name}.
 
 
+%package        c
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+
+%description    c
+The %{name}-cil package contains tools for importing structs
+from C code and header files into %{name}.
+
+
 %prep
 %setup -q
 
@@ -53,6 +65,10 @@
 make doc
 make examples
 
+%if %opt
+strip cil-tools/bitmatch-import-c.opt
+%endif
+
 
 %check
 make test
@@ -65,6 +81,17 @@
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
+# Install bitmatch-import-c by hand for now.
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+%if %opt
+install -m 0755 cil-tools/bitmatch-import-c.opt $RPM_BUILD_ROOT%{_bindir}/bitmatch-import-c
+%else
+install -m 0755 cil-tools/bitmatch-import-c $RPM_BUILD_ROOT%{_bindir}/bitmatch-import-c
+%endif
+
+# Install bitmatch-import-prefix.h by hand for now.
+install -m 0644 cil-tools/bitmatch-import-prefix.h $OCAMLFIND_DESTDIR/bitmatch/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +107,7 @@
 %exclude %{_libdir}/ocaml/bitmatch/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/bitmatch/*.mli
+%exclude %{_libdir}/ocaml/bitmatch/*.h
 
 
 %files devel
@@ -93,7 +121,17 @@
 %{_libdir}/ocaml/bitmatch/*.mli
 
 
+%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
+
 %changelog
+* Tue Jul  1 2008 Richard W.M. Jones <rjones at redhat.com> - 1.9.2-1
+- New upstream release 1.9.2.
+- Include C tools (requiring CIL) in a separate subpackage.
+
 * Wed May 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
 - New upstream release 1.3.