packages: ocaml-cryptokit/ocaml-cryptokit.spec - rel 2 - enable benchmark d...

[baggins]

Author: baggins                      Date: Mon Jul 18 10:07:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- enable benchmark due to broken build deps
- make install can't grok destdir anymore, we have to install by hand
- updated files

---- Files affected:
packages/ocaml-cryptokit:
   ocaml-cryptokit.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/ocaml-cryptokit/ocaml-cryptokit.spec
diff -u packages/ocaml-cryptokit/ocaml-cryptokit.spec:1.18 packages/ocaml-cryptokit/ocaml-cryptokit.spec:1.19
--- packages/ocaml-cryptokit/ocaml-cryptokit.spec:1.18	Mon Jul 18 11:42:10 2011
+++ packages/ocaml-cryptokit/ocaml-cryptokit.spec	Mon Jul 18 12:07:06 2011
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Biblioteka kryptograficzna dla OCamla
 Name:		ocaml-cryptokit
 Version:	1.5
-Release:	1
+Release:	2
 License:	LGPL w/ linking exceptions
 Group:		Libraries
 Source0:	http://forge.ocamlcore.org/frs/download.php/639/cryptokit-%{version}.tar.gz
@@ -78,30 +78,33 @@
 %setup -q -n cryptokit-%{version}
 
 %build
-%{__make} all allopt \
+./configure \
+	--exec-prefix %{_prefix} \
+	--prefix %{_prefix} \
+	--enable-bench
+
+%{__make} all \
 	CFLAGS="%{rpmcflags} -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
 
-%{__make} install \
-	INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
-
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
-install *.cm[ixa]* *.a dll*.so $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
+install _build/src/{*.cm[ixa]*,*.a,dll*.so} $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptokit
 (cd $RPM_BUILD_ROOT%{_libdir}/ocaml && ln -s cryptokit/dll*.so .)
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r *test.ml $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r test/*.ml $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cryptokit
 cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cryptokit/META <<EOF
+description = "Cryptographic primitives"
 requires = "unix num"
 version = "%{version}"
 directory = "+cryptokit"
 archive(byte) = "cryptokit.cma"
 archive(native) = "cryptokit.cmxa"
+exists_if = "cryptokit.cma"
 linkopts = ""
 EOF
 
@@ -110,13 +113,14 @@
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS.txt Changes LICENSE.txt README.txt
 %dir %{_libdir}/ocaml/cryptokit
 %attr(755,root,root) %{_libdir}/ocaml/cryptokit/*.so
 %{_libdir}/ocaml/*.so
 
 %files devel
 %defattr(644,root,root,755)
-%doc LICENSE README doc
+%doc _build/src/api-cryptokit.docdir/*
 %{_libdir}/ocaml/cryptokit/*.cm[ixa]*
 %{_libdir}/ocaml/cryptokit/*.a
 %{_examplesdir}/%{name}-%{version}
@@ -128,6 +132,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/07/18 10:07:06  baggins
+- rel 2
+- enable benchmark due to broken build deps
+- make install can't grok destdir anymore, we have to install by hand
+- updated files
+
 Revision 1.18  2011/07/18 09:42:10  baggins
 - 1.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocaml-cryptokit/ocaml-cryptokit.spec?r1=1.18&r2=1.19&f=u