[packages/ocaml-cryptgps] - added bytes patch from Debian (fixes build with ocaml 4.something+) - updated spec and META file l

[qboosh]

commit e8ea09a562ac4586f5fbeacb1ab4d36c94b8c8b9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 27 16:24:24 2021 +0100

    - added bytes patch from Debian (fixes build with ocaml 4.something+)
    - updated spec and META file location, added base/-devel split
    - release 6

 ocaml-cryptgps.spec | 58 +++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)
---
diff --git a/ocaml-cryptgps.spec b/ocaml-cryptgps.spec
index b068c2e..b5b451a 100644
--- a/ocaml-cryptgps.spec
+++ b/ocaml-cryptgps.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
-%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+%bcond_without	ocaml_opt	# native optimized binaries (bytecode is always built)
 
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
-%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+# not yet available on x32 (ocaml 4.02.1), update when upstream will support it
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
 %undefine	with_ocaml_opt
 %endif
 
@@ -11,13 +11,16 @@ Summary:	Ocaml Blowfish, DES, and 3DES implementation
 Summary(pl.UTF-8):	Implementacja Blowfish, DES, and 3DES w Ocamlu
 Name:		ocaml-cryptgps
 Version:	0.2.1
-Release:	5
-License:	MIT/X11
+Release:	6
+License:	MIT
 Group:		Libraries
 Source0:	http://download.camlcity.org/download/cryptgps-%{version}.tar.gz
 # Source0-md5:	656afb40fa681079296551b546cb02df
+Patch0:		%{name}-bytes.patch
+URL:		http://projects.camlcity.org/projects/cryptgps.html
 BuildRequires:	ocaml >= 3.04-7
 %requires_eq	ocaml-runtime
+Conflicts:	ocaml-cryptgps-devel < 0.2.1-6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,10 +28,15 @@ This library implements the symmetric cryptographic algorithms
 Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
 i.e. this is not a binding to some C library, but the implementation
 itself. 
+
 This package contains files needed to run bytecode executables using
 cryptgps library.
 
 %description -l pl.UTF-8
+Biblioteka implementuje algorytmy szyfrów symetrycznych Blowfish, DES
+oraz 3DES. Algorytmy zostały napisane w OCamlu, więc nie jest to
+wiązanie do biblioteki w C, ale sama implementacja.
+
 Pakiet ten zawiera binaria potrzebne do uruchamiania programów
 używających biblioteki cryptgps.
 
@@ -36,22 +44,20 @@ używających biblioteki cryptgps.
 Summary:	Ocaml Blowfish, DES, and 3DES implementation - development part
 Summary(pl.UTF-8):	Implementacja Blowfish, DES, and 3DES w Ocamlu - cześć programistyczna
 Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 %requires_eq	ocaml
 
 %description devel
-This library implements the symmetric cryptographic algorithms
-Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
-i.e. this is not a binding to some C library, but the implementation
-itself. 
 This package contains files needed to develop OCaml programs using
 cryptgps library.
 
 %description devel -l pl.UTF-8
-Pakiet ten zawiera pliki niezbędne do tworzenia programów używających
-biblioteki cryptgps.
+Pakiet ten zawiera pliki niezbędne do tworzenia programów w OCamlu
+używających biblioteki cryptgps.
 
 %prep
 %setup -q -n cryptgps
+%patch0 -p1
 
 %build
 %{__make} all %{?with_ocaml_opt:opt} \
@@ -59,33 +65,29 @@ biblioteki cryptgps.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{,site-lib/}cryptgps
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptgps
 
-install *.cm[ix] $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptgps
+cp -p META *.cm[ai] *.mli $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptgps
 %if %{with ocaml_opt}
-install *.cmxa *.a $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptgps
+cp -p *.cmx* *.a $RPM_BUILD_ROOT%{_libdir}/ocaml/cryptgps
 %endif
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cryptgps
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cryptgps/META <<EOF
-requires = "bigarray"
-version = "%{version}"
-directory = "+cryptgps"
-archive(byte) = "cryptgps.cma"
-archive(native) = "cryptgps.cmxa"
-linkopts = ""
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files devel
+%files
 %defattr(644,root,root,755)
-%doc LICENSE *.mli
+%doc LICENSE README
 %dir %{_libdir}/ocaml/cryptgps
-%{_libdir}/ocaml/cryptgps/*.cm[xi]
+%{_libdir}/ocaml/cryptgps/META
+%{_libdir}/ocaml/cryptgps/*.cma
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/ocaml/cryptgps/*.cmi
+%{_libdir}/ocaml/cryptgps/*.mli
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/cryptgps/*.a
+%{_libdir}/ocaml/cryptgps/*.cmx
 %{_libdir}/ocaml/cryptgps/*.cmxa
 %endif
-%{_libdir}/ocaml/site-lib/cryptgps
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-cryptgps.git/commitdiff/e8ea09a562ac4586f5fbeacb1ab4d36c94b8c8b9