X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=ocaml-pxp.spec;h=3c5c0a7d13c5234c128701a4f33987b71cbc10dc;hb=b6a162041bf499b1423017ef33f1e76fc3f0f048;hp=949b661079d4d80d7f2a04b449009cf65244954d;hpb=e6e517ef1e8630c7f540d81572fdd702942067dd;p=packages%2Focaml-pxp.git

diff --git a/ocaml-pxp.spec b/ocaml-pxp.spec
index 949b661..3c5c0a7 100644
--- a/ocaml-pxp.spec
+++ b/ocaml-pxp.spec
@@ -1,20 +1,33 @@
-%define		ocaml_ver	1:3.09.2
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# skip building 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
+%undefine	with_ocaml_opt
+%endif
+
 Summary:	Polimorphic XML Parser for OCaml
 Summary(pl.UTF-8):	Polimorficzny analizator składniowy XML-a dla OCamla
 Name:		ocaml-pxp
-Version:	1.1.6
-Release:	10
+Version:	1.2.9
+Release:	2
 License:	distributable
 Group:		Libraries
-Source0:	http://www.ocaml-programming.de/packages/pxp-%{version}.tar.gz
-# Source0-md5:	8f1c26e348405fb7f064b4bc2584ab59
-URL:		http://www.ocaml-programming.de/programming/pxp.html
-BuildRequires:	ocaml >= %{ocaml_devel}
+Source0:	http://download.camlcity.org/download/pxp-%{version}.tar.gz
+# Source0-md5:	8002253eade813b8355500f4c59f8da8
+URL:		http://projects.camlcity.org/projects/pxp.html
+BuildRequires:	ocaml >= 1:3.09.2
+BuildRequires:	ocaml-camlp4
 BuildRequires:	ocaml-findlib
-BuildRequires:	ocaml-net-netstring-devel >= 1.1.1-2
-BuildRequires:	ocaml-wlex-devel
+BuildRequires:	ocaml-ocamldoc-devel
+BuildRequires:	ocaml-net-netstring-devel >= 3.6-2
+BuildRequires:	ocaml-net-netsys-devel >= 3.6-2
+BuildRequires:	ocaml-net-netunidata-devel
+BuildRequires:	ocaml-ulex
 BuildRequires:	sed >= 4.0
-%requires_eq	ocaml-wlex
+BuildConflicts:	ocaml-wlex-devel
+%requires_eq	ocaml-ulex
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,7 +54,6 @@ Summary(pl.UTF-8):	Polimorficzny analizator składniowy XML-a dla OCamla - cześ
 Group:		Development/Libraries
 %requires_eq	ocaml
 %requires_eq	ocaml-net-netstring-devel
-%requires_eq	ocaml-wlex-devel
 
 %description devel
 PXP is a validating parser for XML 1.0 which has been written entirely
@@ -71,13 +83,14 @@ biblioteki PXP.
 
 %build
 ./configure \
-	-with-lex-iso88591 \
-	-with-lex-utf8 \
-	-with-wlex
+	-with-lex \
+	-with-ulex \
+	-without-wlex \
+	-with-pp
 
 sed -i -e 's/-g//' Makefile.rules
 %{__make} -j1 \
-	all opt
+	all %{?with_ocaml_opt:opt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +106,6 @@ for f in * ; do
 	fi
 done
 cd $dir
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/pxp/*.{o,mli}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -103,9 +115,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/ABOUT-FINDLIB doc/EXTENSIONS doc/README doc/RELEASE-NOTES doc/SPEC
-%doc doc/design.txt LICENSE doc/manual/html
+%doc doc/README doc/SPEC
+%doc doc/design.txt doc/manual/html
 %dir %{_libdir}/ocaml/pxp
-%{_libdir}/ocaml/pxp/*
+%{_libdir}/ocaml/pxp/*.cm[xi]
+%{_libdir}/ocaml/pxp/*.cma
+%{_libdir}/ocaml/pxp/*.cmo
+%{_libdir}/ocaml/pxp/*.mli
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/pxp/*.[ao]
+%{_libdir}/ocaml/pxp/*.cmxa
+%endif
 %{_examplesdir}/%{name}-%{version}
 %{_libdir}/ocaml/site-lib/*