diff --git a/.gitignore b/.gitignore index 3c84291..a491315 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ cryptokit-1.3.tar.gz /cryptokit-1.4.tar.gz /cryptokit-1.6.tar.gz /cryptokit-1.9.tar.gz +/cryptokit-1.11.tar.gz diff --git a/cryptokit-1.9-uint32.patch b/cryptokit-1.9-uint32.patch deleted file mode 100644 index b0f60e5..0000000 --- a/cryptokit-1.9-uint32.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur cryptokit-1.9.old/src/stubs-md5.c cryptokit-1.9/src/stubs-md5.c ---- cryptokit-1.9.old/src/stubs-md5.c 2010-08-30 11:53:00.000000000 +0100 -+++ cryptokit-1.9/src/stubs-md5.c 2014-11-03 13:16:54.548572332 +0000 -@@ -18,8 +18,8 @@ - #include - - struct MD5Context { -- uint32 buf[4]; -- uint32 bits[2]; -+ uint32_t buf[4]; -+ uint32_t bits[2]; - unsigned char in[64]; - }; - diff --git a/ocaml-cryptokit.spec b/ocaml-cryptokit.spec index d9fc425..4dd9c41 100644 --- a/ocaml-cryptokit.spec +++ b/ocaml-cryptokit.spec @@ -1,20 +1,18 @@ %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-cryptokit -Version: 1.9 -Release: 17%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: OCaml library of cryptographic and hash functions License: LGPLv2 with exceptions URL: http://forge.ocamlcore.org/projects/cryptokit/ -Source0: https://forge.ocamlcore.org/frs/download.php/1229/cryptokit-%{version}.tar.gz - -# OCaml headers dropped uint32/etc. Use standard uint32_t instead. -Patch1: cryptokit-1.9-uint32.patch +Source0: https://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz BuildRequires: ocaml BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-findlib-devel BuildRequires: zlib-devel BuildRequires: chrpath @@ -56,12 +54,8 @@ developing applications that use %{name}. %prep %setup -q -n cryptokit-%{version} -%patch1 -p1 - -./configure --destdir $RPM_BUILD_ROOT - - %build +./configure --destdir $RPM_BUILD_ROOT # Some sort of circular dependency, so sometimes the first make fails. # Just run make twice. make ||: @@ -106,6 +100,9 @@ make install %changelog +* Mon Nov 07 2016 Richard W.M. Jones - 1.11-1 +- New upstream version 1.11. + * Thu Feb 04 2016 Fedora Release Engineering - 1.9-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index eea9554..0a513b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4432a426c9d260822f4ff2b0750413de cryptokit-1.9.tar.gz +931f8240ad30d9930d0f584f2921de69 cryptokit-1.11.tar.gz