rpms/ocaml-SDL/devel ocaml-SDL.spec,1.4,1.5

[Richard W.M. Jones (rjones)]

Author: rjones

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

Modified Files:
	ocaml-SDL.spec 
Log Message:
* Wed Feb 13 2008 Richard W.M. Jones <rjones at redhat.com> 0.7.2-8
- Rebuild for OCaml 3.10.1.
- Generate correct provides and requires.
- Fix 'make install' rule for new ocamlfind.
- Fix paths to conform with OCaml packaging guidelines.



Index: ocaml-SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-SDL/devel/ocaml-SDL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-SDL.spec	9 May 2007 02:54:32 -0000	1.4
+++ ocaml-SDL.spec	13 Feb 2008 11:18:16 -0000	1.5
@@ -1,6 +1,9 @@
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%define debug_package %{nil}
+
 Name:           ocaml-SDL
 Version:        0.7.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OCaml bindings for SDL
 
 Group:          Development/Libraries
@@ -17,6 +20,10 @@
 BuildRequires:  ocaml
 Requires:       ocaml
 
+%define _use_internal_dependency_generator 0
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+
 %description
 Runtime libraries to allow programs written in OCaml to write to SDL 
 (Simple DirectMedia Layer) interfaces.
@@ -40,8 +47,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
+mkdir -p $OCAMLFIND_DESTDIR/stublibs
 make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/sdl/*.mli
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,15 +61,33 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS NEWS
+%{_libdir}/ocaml/sdl
 %{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so.owner
+%if %opt
+%exclude %{_libdir}/ocaml/sdl/*.a
+%exclude %{_libdir}/ocaml/sdl/*.cmxa
+%endif
+%exclude %{_libdir}/ocaml/sdl/*.mli
+
 
 %files devel
 %defattr(-,root,root,-)
 %doc htmlref/
-%{_libdir}/ocaml/sdl
+%if %opt
+%{_libdir}/ocaml/sdl/*.a
+%{_libdir}/ocaml/sdl/*.cmxa
+%endif
+%{_libdir}/ocaml/sdl/*.mli
 
 
 %changelog
+* Wed Feb 13 2008 Richard W.M. Jones <rjones at redhat.com> 0.7.2-8
+- Rebuild for OCaml 3.10.1.
+- Generate correct provides and requires.
+- Fix 'make install' rule for new ocamlfind.
+- Fix paths to conform with OCaml packaging guidelines.
+
 * Wed May 09 2007 Nigel Jones <dev at nigelj.com> 0.7.2-7
 - ExcludeArch ppc64 until ocaml builds