[packages/ocaml-pxp] - added build fix from Debian - unified runtime/devel split - release 3

Sun Dec 19 21:45:01 CET 2021

commit aa89c42243b0bbef68ce6cf422e3aeada3cff219
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 19 21:45:40 2021 +0100

    - added build fix from Debian
    - unified runtime/devel split
    - release 3

 ocaml-pxp-debian-build-fix.patch | 56 +++++++++++++++++++++++++++
 ocaml-pxp.spec                   | 83 +++++++++++++++++++++++++++-------------
 2 files changed, 112 insertions(+), 27 deletions(-)
---

diff --git a/ocaml-pxp.spec b/ocaml-pxp.spec
index 3c5c0a7..a67a4b0 100644
--- a/ocaml-pxp.spec
+++ b/ocaml-pxp.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,11 +11,12 @@ Summary:	Polimorphic XML Parser for OCaml
 Summary(pl.UTF-8):	Polimorficzny analizator składniowy XML-a dla OCamla
 Name:		ocaml-pxp
 Version:	1.2.9
-Release:	2
+Release:	3
 License:	distributable
 Group:		Libraries
 Source0:	http://download.camlcity.org/download/pxp-%{version}.tar.gz
 # Source0-md5:	8002253eade813b8355500f4c59f8da8
+Patch0:		%{name}-debian-build-fix.patch
 URL:		http://projects.camlcity.org/projects/pxp.html
 BuildRequires:	ocaml >= 1:3.09.2
 BuildRequires:	ocaml-camlp4
@@ -29,6 +30,7 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	ocaml-wlex-devel
 %requires_eq	ocaml-ulex
 %requires_eq	ocaml-runtime
+Conflicts:	ocaml-pxp-devel < 1.2.9-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,11 +77,12 @@ składniowy XML-a), co podkreśla jego najbardziej użyteczną własność:
 API jest polimorficzne i może być skonfigurowane tak, że różne obiekty
 są używane do przechowywania różnych typów elementów.
 
-Pakiet ten zawiera pliki niezbędne do tworzenia programów używających
-biblioteki PXP.
+Pakiet ten zawiera pliki niezbędne do tworzenia programów w OCamlu
+używających biblioteki PXP.
 
 %prep
 %setup -q -n pxp-%{version}
+%patch0 -p1
 
 %build
 ./configure \
@@ -94,37 +97,63 @@ sed -i -e 's/-g//' Makefile.rules
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{site-lib,pxp}
-OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib %{__make} install
-dir=`pwd`
-cd $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib
-for f in * ; do
-	echo 'directory = "+pxp"' >> $f/META
-	if [ "`echo $f/*.*`" != "$f/*.*" ]; then
-		mv $f/*.* $RPM_BUILD_ROOT%{_libdir}/ocaml/pxp
-	fi
-done
-cd $dir
+OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \
+%{__make} install
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files devel
+%files
 %defattr(644,root,root,755)
 %doc doc/README doc/SPEC
-%doc doc/design.txt doc/manual/html
 %dir %{_libdir}/ocaml/pxp
-%{_libdir}/ocaml/pxp/*.cm[xi]
-%{_libdir}/ocaml/pxp/*.cma
-%{_libdir}/ocaml/pxp/*.cmo
-%{_libdir}/ocaml/pxp/*.mli
+%{_libdir}/ocaml/pxp/META
+%dir %{_libdir}/ocaml/pxp-engine
+%{_libdir}/ocaml/pxp-engine/META
+%{_libdir}/ocaml/pxp-engine/*.cma
+%dir %{_libdir}/ocaml/pxp-lex-iso8859*
+%{_libdir}/ocaml/pxp-lex-iso8859*/META
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.cma
+%{_libdir}/ocaml/pxp-lex-utf8/META
+%{_libdir}/ocaml/pxp-lex-utf8/*.cma
+%dir %{_libdir}/ocaml/pxp-pp
+%{_libdir}/ocaml/pxp-pp/META
+%{_libdir}/ocaml/pxp-pp/*.cma
+%dir %{_libdir}/ocaml/pxp-ulex-utf8
+%{_libdir}/ocaml/pxp-ulex-utf8/META
+%{_libdir}/ocaml/pxp-ulex-utf8/*.cma
+
+%files devel
+%defattr(644,root,root,755)
+%doc doc/design.txt doc/manual/html
+%{_libdir}/ocaml/pxp-engine/*.cmi
+%{_libdir}/ocaml/pxp-engine/*.cmo
+%{_libdir}/ocaml/pxp-engine/*.mli
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.cmi
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.cmo
+%{_libdir}/ocaml/pxp-lex-utf8/*.cmi
+%{_libdir}/ocaml/pxp-lex-utf8/*.cmo
+%{_libdir}/ocaml/pxp-ulex-utf8/*.cmi
+%{_libdir}/ocaml/pxp-ulex-utf8/*.cmo
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/pxp/*.[ao]
-%{_libdir}/ocaml/pxp/*.cmxa
+%{_libdir}/ocaml/pxp-engine/*.a
+%{_libdir}/ocaml/pxp-engine/*.cmxa
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.a
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.cmx
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.cmxa
+%{_libdir}/ocaml/pxp-lex-iso8859*/*.o
+%{_libdir}/ocaml/pxp-lex-utf8/*.a
+%{_libdir}/ocaml/pxp-lex-utf8/*.cmx
+%{_libdir}/ocaml/pxp-lex-utf8/*.cmxa
+%{_libdir}/ocaml/pxp-lex-utf8/*.o
+%{_libdir}/ocaml/pxp-ulex-utf8/*.a
+%{_libdir}/ocaml/pxp-ulex-utf8/*.cmx
+%{_libdir}/ocaml/pxp-ulex-utf8/*.cmxa
+%{_libdir}/ocaml/pxp-ulex-utf8/*.o
 %endif
 %{_examplesdir}/%{name}-%{version}
-%{_libdir}/ocaml/site-lib/*
diff --git a/ocaml-pxp-debian-build-fix.patch b/ocaml-pxp-debian-build-fix.patch
new file mode 100644
index 0000000..d5cb121
--- /dev/null
+++ b/ocaml-pxp-debian-build-fix.patch
@@ -0,0 +1,56 @@
+From: Christopher Cramer <tsuyoshi at yumegakanau.org>
+Date: Thu, 21 Nov 2019 13:27:08 +0100
+Subject: Fix compilation with OCaml 4.08.1
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944593
+---
+ src/pxp-engine/pxp_lexing.mli  | 6 +++---
+ tools/src/odoc/Makefile        | 2 +-
+ tools/src/odoc/chtml_ocaml4.ml | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/pxp-engine/pxp_lexing.mli b/src/pxp-engine/pxp_lexing.mli
+index 5dc3497..ffa6e34 100644
+--- a/src/pxp-engine/pxp_lexing.mli
++++ b/src/pxp-engine/pxp_lexing.mli
+@@ -10,11 +10,11 @@
+ 
+ type lexbuf = Lexing.lexbuf
+ 
+-val from_channel : in_channel -> lexbuf
++val from_channel : ?with_positions:bool -> in_channel -> lexbuf
+ 
+-val from_string : string -> lexbuf
++val from_string : ?with_positions:bool -> string -> lexbuf
+ 
+-val from_function : (Bytes.t -> int -> int) -> lexbuf
++val from_function : ?with_positions:bool -> (Bytes.t -> int -> int) -> lexbuf
+ 
+ val lexeme : lexbuf -> string
+ 
+diff --git a/tools/src/odoc/Makefile b/tools/src/odoc/Makefile
+index 071bf8d..67dbeb4 100644
+--- a/tools/src/odoc/Makefile
++++ b/tools/src/odoc/Makefile
+@@ -3,7 +3,7 @@ include $(TOP_DIR)/Makefile.rules
+ 
+ SRC = chtml.ml
+ OBJ = $(SRC:.ml=.cmo)
+-OCAMLC_OPTIONS += -I +ocamldoc
++OCAMLC_OPTIONS += -I +ocamldoc -I +compiler-libs
+ CLEAN_LIST += chtml.ml
+ 
+ .PHONY: all
+diff --git a/tools/src/odoc/chtml_ocaml4.ml b/tools/src/odoc/chtml_ocaml4.ml
+index dbf8caf..667930f 100644
+--- a/tools/src/odoc/chtml_ocaml4.ml
++++ b/tools/src/odoc/chtml_ocaml4.ml
+@@ -34,7 +34,7 @@ open Printf
+ open Odoc_info
+ open Module
+ 
+-module StringSet = Odoc_html.StringSet
++module StringSet = Odoc_html.String.Set
+ 
+ 
+ let word_re = Str.regexp "[ \t\r\n]+"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-pxp.git/commitdiff/aa89c42243b0bbef68ce6cf422e3aeada3cff219

