From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 5 Jun 2017 19:49:14 +0000 (+0200)
Subject: - up to 1.5.0
X-Git-Tag: auto/th/cppo-1.5.0-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcppo.git;a=commitdiff_plain;h=54eff1f14bf135c88e6ff2518f2d81a6a6ea34d5

- up to 1.5.0
---

diff --git a/cppo.spec b/cppo.spec
index 61bc443..f843f64 100644
--- a/cppo.spec
+++ b/cppo.spec
@@ -11,14 +11,16 @@
 Summary:	Preprocessor (cpp equivalent) for OCaml
 Summary(pl.UTF-8):	Preprocesor (odpowiednik cpp) dla OCamla
 Name:		cppo
-Version:	1.1.2
-Release:	3
+Version:	1.5.0
+Release:	1
 License:	BSD
 Group:		Development/Tools
-Source0:	http://mjambon.com/releases/cppo/%{name}-%{version}.tar.gz
-# Source0-md5:	f1a551639c0c667ee8840d95ea5b2ab7
+Source0:	https://github.com/mjambon/cppo/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	bdc99442945f6bc26e7a8096d0975239
+Patch0:		noopt-install.patch
 URL:		http://mjambon.com/cppo.html
 BuildRequires:	ocaml >= 3.04-7
+BuildRequires:	ocaml-ocamlbuild
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,6 +63,7 @@ Pliki programistyczne biblioteki ocamlbuild_cppo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # "all" makes bytecode-based cppo, "opt" makes native
diff --git a/noopt-install.patch b/noopt-install.patch
new file mode 100644
index 0000000..22b5bf3
--- /dev/null
+++ b/noopt-install.patch
@@ -0,0 +1,17 @@
+--- cppo-1.5.0/Makefile~	2017-04-24 22:34:11.000000000 +0200
++++ cppo-1.5.0/Makefile	2017-06-05 21:47:06.476440992 +0200
+@@ -45,9 +45,14 @@
+ endif
+ endif
+ 
++ifeq "${BEST}" ".native"
+ OCAMLBUILD_INSTALL = ocamlbuild_plugin/_build/ocamlbuild_cppo.cmi \
+                      ocamlbuild_plugin/_build/ocamlbuild_cppo.cmx \
+                      $(addprefix ocamlbuild_plugin/_build/,$(OCAMLBUILD_IMPL))
++else
++OCAMLBUILD_INSTALL = ocamlbuild_plugin/_build/ocamlbuild_cppo.cmi \
++                     $(addprefix ocamlbuild_plugin/_build/,$(OCAMLBUILD_IMPL))
++endif
+ 
+ 
+ .PHONY: default all opt toplib install clean test