From de708847b6aefb040a12e53188548e3c3b920aca Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 2 Sep 2008 13:02:46 +0000
Subject: [PATCH] - Install in cryptokit subdirectory. - Include a META file
 (from Debian) (resolves rhbz#460844).

---
 cryptokit-META       |  7 +++++++
 ocaml-cryptokit.spec | 39 +++++++++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 cryptokit-META

diff --git a/cryptokit-META b/cryptokit-META
new file mode 100644
index 0000000..c3ac6db
--- /dev/null
+++ b/cryptokit-META
@@ -0,0 +1,7 @@
+name="cryptokit"
+version="@VERSION@"
+description="Cryptographic primitives"
+requires="num unix"
+archive(byte)="cryptokit.cma"
+archive(native)="cryptokit.cmxa"
+directory="+cryptokit"
\ No newline at end of file
diff --git a/ocaml-cryptokit.spec b/ocaml-cryptokit.spec
index e82ee2b..8444a03 100644
--- a/ocaml-cryptokit.spec
+++ b/ocaml-cryptokit.spec
@@ -3,15 +3,17 @@
 
 Name:           ocaml-cryptokit
 Version:        1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml library of cryptographic and hash functions
 
 Group:          Development/Libraries
 License:        LGPLv2 with exceptions
 URL:            http://pauillac.inria.fr/~xleroy/software.html
-Source0:        http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-1.3.tar.gz
+Source0:        http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1:        cryptokit-META
+
 BuildRequires:  ocaml, zlib-devel, chrpath
 
 %define _use_internal_dependency_generator 0
@@ -74,9 +76,14 @@ make test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml install
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/stublibs
+make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit install
+mv $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/stublibs \
+  $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+
+sed 's/@VERSION@/%{version}/' < %{SOURCE1} \
+  > $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit/META
 
 
 %clean
@@ -86,13 +93,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{_libdir}/ocaml/*.*
+%{_libdir}/ocaml/cryptokit
 %if %opt
-%exclude %{_libdir}/ocaml/*.a
-%exclude %{_libdir}/ocaml/*.cmxa
-%exclude %{_libdir}/ocaml/*.cmx
+%exclude %{_libdir}/ocaml/cryptokit/*.a
+%exclude %{_libdir}/ocaml/cryptokit/*.cmxa
+%exclude %{_libdir}/ocaml/cryptokit/*.cmx
 %endif
-%exclude %{_libdir}/ocaml/*.mli
+%exclude %{_libdir}/ocaml/cryptokit/*.mli
 %{_libdir}/ocaml/stublibs/*.so
 
 
@@ -100,14 +107,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE Changes doc
 %if %opt
-%{_libdir}/ocaml/*.a
-%{_libdir}/ocaml/*.cmxa
-%{_libdir}/ocaml/*.cmx
+%{_libdir}/ocaml/cryptokit/*.a
+%{_libdir}/ocaml/cryptokit/*.cmxa
+%{_libdir}/ocaml/cryptokit/*.cmx
 %endif
-%{_libdir}/ocaml/*.mli
+%{_libdir}/ocaml/cryptokit/*.mli
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3-5
+- Install in cryptokit subdirectory.
+- Include a META file (from Debian) (resolves rhbz#460844).
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones@redhat.com> - 1.3-4
 - Rebuild for OCaml 3.10.2