[ocaml-cryptokit] Rebuild for OCaml 3.12.0.
Richard W.M. Jones
rjones at fedoraproject.org
Wed Jan 5 19:27:08 UTC 2011
commit 457c88d4752d1a388c96a375a13988ac78438d0c
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Jan 5 19:14:52 2011 +0000
Rebuild for OCaml 3.12.0.
.gitignore | 1 +
cryptokit-META | 7 ------
ocaml-cryptokit.spec | 55 ++++++++++++++++++++++++++-----------------------
sources | 2 +-
4 files changed, 31 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5370ac4..1f9c8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
cryptokit-1.3.tar.gz
+/cryptokit-1.4.tar.gz
diff --git a/ocaml-cryptokit.spec b/ocaml-cryptokit.spec
index 20c6384..5d977f9 100644
--- a/ocaml-cryptokit.spec
+++ b/ocaml-cryptokit.spec
@@ -2,19 +2,17 @@
%define debug_package %{nil}
Name: ocaml-cryptokit
-Version: 1.3
-Release: 11%{?dist}
+Version: 1.4
+Release: 1%{?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-%{version}.tar.gz
+URL: http://forge.ocamlcore.org/projects/cryptokit/
+Source0: https://forge.ocamlcore.org/frs/download.php/460/cryptokit-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
-Source1: cryptokit-META
-
BuildRequires: ocaml, zlib-devel, chrpath
%define _use_internal_dependency_generator 0
@@ -57,17 +55,17 @@ developing applications that use %{name}.
%prep
%setup -q -n cryptokit-%{version}
-rm doc/.cvsignore
+./configure --destdir $RPM_BUILD_ROOT
%build
-make all
-%if %opt
-make allopt
-%endif
+# Some sort of circular dependency, so sometimes the first make fails.
+# Just run make twice.
+make ||:
+make
-chrpath --delete dllcryptokit.so
-strip dllcryptokit.so
+chrpath --delete _build/src/dllcryptokit.so
+strip _build/src/dllcryptokit.so
%check
@@ -77,14 +75,11 @@ make test
%install
rm -rf $RPM_BUILD_ROOT
-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
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ocaml/stublibs
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT/%{_libdir}/ocaml
+make install
%clean
@@ -93,29 +88,37 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc README LICENSE
+%doc LICENSE.txt
%{_libdir}/ocaml/cryptokit
%if %opt
%exclude %{_libdir}/ocaml/cryptokit/*.a
%exclude %{_libdir}/ocaml/cryptokit/*.cmxa
-%exclude %{_libdir}/ocaml/cryptokit/*.cmx
+#%exclude %{_libdir}/ocaml/cryptokit/*.cmx
%endif
%exclude %{_libdir}/ocaml/cryptokit/*.mli
-%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so*
%files devel
%defattr(-,root,root,-)
-%doc LICENSE Changes doc
+%doc README.txt LICENSE.txt Changes
%if %opt
%{_libdir}/ocaml/cryptokit/*.a
%{_libdir}/ocaml/cryptokit/*.cmxa
-%{_libdir}/ocaml/cryptokit/*.cmx
+#%{_libdir}/ocaml/cryptokit/*.cmx
%endif
%{_libdir}/ocaml/cryptokit/*.mli
%changelog
+* Wed Jan 5 2011 Richard W.M. Jones <rjones at redhat.com> - 1.4-1
+- New upstream version 1.4.
+- Project has moved to a new location.
+- META file is included in the project.
+- Rebuild for OCaml 3.12.0.
+- Build system changed.
+- *.cmx files are no longer installed during build.
+
* Wed Dec 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-11
- Rebuild for OCaml 3.11.2.
diff --git a/sources b/sources
index 96cfd50..15f6bc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7de01d0702d16b3491c9e794ebb2cc3 cryptokit-1.3.tar.gz
+fbec0562e9ad4cbab8a39f61a3ee66c7 cryptokit-1.4.tar.gz
More information about the scm-commits
mailing list