[ocaml-mikmatch] New upstream version 1.0.7.
Richard W.M. Jones
rjones at fedoraproject.org
Sat Aug 2 18:59:18 UTC 2014
commit d05fa3634428026bca0c7be38001a85d216d661a
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Aug 2 19:52:40 2014 +0100
New upstream version 1.0.7.
- Rebuild for ocaml-4.02.0-0.8.git10e45753.fc22.
- New upstream URL.
.gitignore | 7 +---
0001-minor-fix-to-str-ocamlfind-requirements.patch | 26 ++++++++++++
0002-fix-for-pcre-7.10.patch | 44 ++++++++++++++++++++
ocaml-mikmatch.spec | 20 ++++++++-
sources | 2 +-
5 files changed, 89 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ae0892..b6040f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-mikmatch-1.0.2.tar.bz2
-/mikmatch-1.0.3.tar.bz2
-/mikmatch-1.0.4.tar.gz
-/mikmatch-1.0.4.tar.bz2
-/mikmatch-1.0.5.tar.gz
-/mikmatch-1.0.6.tar.gz
+/mikmatch-*.tar.gz
diff --git a/0001-minor-fix-to-str-ocamlfind-requirements.patch b/0001-minor-fix-to-str-ocamlfind-requirements.patch
new file mode 100644
index 0000000..a8ae201
--- /dev/null
+++ b/0001-minor-fix-to-str-ocamlfind-requirements.patch
@@ -0,0 +1,26 @@
+From 27ff31a6c901e04a96162930f484ac341346e35c Mon Sep 17 00:00:00 2001
+From: andrewray <evilkidder at gmail.com>
+Date: Sun, 8 Jun 2014 10:11:46 +0100
+Subject: [PATCH 1/2] minor fix to str ocamlfind requirements
+
+needs package str rather than pcre
+---
+ str/META.template | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/str/META.template b/str/META.template
+index b692995..961e89b 100644
+--- a/str/META.template
++++ b/str/META.template
+@@ -2,7 +2,7 @@ name = "mikmatch_str"
+ version = "VERSION"
+ description = "Pattern matching extended with regexps in Ocamllex syntax"
+
+-requires = "camlp4 pcre unix"
++requires = "camlp4 str unix"
+ requires(toploop) += "tophide"
+
+ archive(syntax,toploop) = "pa_mikmatch_str.cma run_mikmatch_str.cma"
+--
+1.9.3
+
diff --git a/0002-fix-for-pcre-7.10.patch b/0002-fix-for-pcre-7.10.patch
new file mode 100644
index 0000000..5851f4b
--- /dev/null
+++ b/0002-fix-for-pcre-7.10.patch
@@ -0,0 +1,44 @@
+From 315cc494a67d5b33e1d3356feb483c561192418a Mon Sep 17 00:00:00 2001
+From: andrewray <evilkidder at gmail.com>
+Date: Sun, 8 Jun 2014 11:28:44 +0100
+Subject: [PATCH 2/2] fix for pcre 7.10
+
+---
+ VERSION | 2 +-
+ pcre/run_mikmatch_pcre.ml | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/VERSION b/VERSION
+index 3acc00b..22b2c19 100755
+--- a/VERSION
++++ b/VERSION
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-mikmatch_version="1.0.7"
++mikmatch_version="1.0.8"
+ echo -n $mikmatch_version
+diff --git a/pcre/run_mikmatch_pcre.ml b/pcre/run_mikmatch_pcre.ml
+index 34f82ff..50db948 100644
+--- a/pcre/run_mikmatch_pcre.ml
++++ b/pcre/run_mikmatch_pcre.ml
+@@ -16,7 +16,7 @@ let search rex f ?(pos = 0) subj =
+ if
+ try
+ unsafe_pcre_exec
+- irflags rex cur_pos subj subgroup_offsets offset_vector None; true
++ irflags rex ~pos:cur_pos ~subj_start:0 ~subj ~subgroups2:subgroup_offsets offset_vector None; true
+ with Not_found -> false
+ then
+ (f substrings;
+@@ -34,7 +34,7 @@ let scan ~full rex pos ~ftext ~fmatch subj =
+ if
+ try
+ unsafe_pcre_exec
+- irflags rex cur_pos subj subgroup_offsets offset_vector None; true
++ irflags rex ~pos:cur_pos ~subj_start:0 ~subj ~subgroups2:subgroup_offsets offset_vector None; true
+ with Not_found ->
+ let last = String.length subj in
+ if full || last > previous_last then
+--
+1.9.3
+
diff --git a/ocaml-mikmatch.spec b/ocaml-mikmatch.spec
index edb4fdd..454860e 100644
--- a/ocaml-mikmatch.spec
+++ b/ocaml-mikmatch.spec
@@ -2,13 +2,19 @@
%global debug_package %{nil}
Name: ocaml-mikmatch
-Version: 1.0.6
-Release: 7%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
Summary: OCaml extension for pattern matching with regexps
License: BSD
URL: http://mjambon.com/micmatch.html
-Source0: http://mjambon.com/releases/mikmatch/mikmatch-%{version}.tar.gz
+# The actual URL is:
+# https://github.com/mjambon/mikmatch/archive/v%{version}.tar.gz
+Source0: mikmatch-1.0.7.tar.gz
+
+# Upstream patches that fix the build with new ocaml-pcre.
+Patch1: 0001-minor-fix-to-str-ocamlfind-requirements.patch
+Patch2: 0002-fix-for-pcre-7.10.patch
ExcludeArch: sparc64 s390 s390x
@@ -49,6 +55,9 @@ developing applications that use %{name}.
%prep
%setup -q -n mikmatch-%{version}
+%patch1 -p1
+%patch2 -p1
+
%build
# Parallel builds don't work:
@@ -97,6 +106,11 @@ make install-str install-pcre
%changelog
+* Sat Aug 02 2014 Richard W.M. Jones <rjones at redhat.com> - 1.0.7-1
+- New upstream version 1.0.7.
+- Rebuild for ocaml-4.02.0-0.8.git10e45753.fc22.
+- New upstream URL.
+
* Mon Jul 21 2014 Richard W.M. Jones <rjones at redhat.com> - 1.0.6-7
- OCaml 4.02.0 beta rebuild.
diff --git a/sources b/sources
index faa7278..ec995a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-180854a13780a4db850c0d4bd646a9c1 mikmatch-1.0.6.tar.gz
+70aabc8eb8f67ab3ac3f36bbd04729f4 mikmatch-1.0.7.tar.gz
More information about the scm-commits
mailing list