From e6d874badf498fd2976853bc8e2ad36beedd86ab Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Oct 2012 13:07:33 +0000
Subject: [PATCH] New upstream version 7.0.2.

- Rebuild for OCaml 4.00.1.
- Fix homepage and source.
- Clean up the spec file.
---
 .gitignore      |  1 +
 ocaml-pcre.spec | 43 ++++++++++++++++++++++---------------------
 sources         |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdc54a1..4e86161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 release-6.0.1.tar.bz2
 /release-6.1.1.tar.bz2
 /release-6.2.5.tar.bz2
+/pcre-ocaml-7.0.2.tar.gz
diff --git a/ocaml-pcre.spec b/ocaml-pcre.spec
index 6b353ce..ea6dc48 100644
--- a/ocaml-pcre.spec
+++ b/ocaml-pcre.spec
@@ -1,15 +1,14 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-pcre
-Version:        6.2.5
-Release:        4%{?dist}
+Version:        7.0.2
+Release:        1%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
-Group:          Development/Libraries
 License:        LGPLv2
-URL:            http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml
-Source0:        http://hg.ocaml.info/release/pcre-ocaml/archive/release-%{version}.tar.bz2
+URL:            https://bitbucket.org/mmottl/pcre-ocaml
+Source0:        https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -18,9 +17,6 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  pcre-devel
 BuildRequires:  gawk
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
 Perl compatibility regular expressions (PCRE) for OCaml.
@@ -28,7 +24,6 @@ Perl compatibility regular expressions (PCRE) for OCaml.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 # This isn't quite right - we need to specify same architecture of pcre-devel
 Requires:       pcre-devel
@@ -40,7 +35,11 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n pcre-ocaml-release-%{version}
+%setup -q -n pcre-ocaml-%{version}
+./configure \
+  --prefix %{_prefix} \
+  --docdir %{_docdir} \
+  --destdir $RPM_BUILD_ROOT
 
 
 %build
@@ -49,11 +48,10 @@ make all
 %else
 make -C lib byte-code-library
 %endif
-strip lib/dll*.so
+strip _build/lib/dll*.so
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
@@ -63,14 +61,12 @@ make NATIVE=true install
 make LIBINSTALL_FILES="pcre.mli pcre.cmi pcre.cma libpcre_stubs.a dllpcre_stubs.so" install
 %endif
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Installs API docs in %{_docdir}/api.  Install this using %doc instead.
+mv $RPM_BUILD_ROOT%{_docdir}/api .
 
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE README.txt
+%doc COPYING.txt
 %{_libdir}/ocaml/pcre
 %if %opt
 %exclude %{_libdir}/ocaml/pcre/*.a
@@ -82,8 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc LICENSE README.txt
+%doc COPYING.txt README.md api
 %if %opt
 %{_libdir}/ocaml/pcre/*.a
 %{_libdir}/ocaml/pcre/*.cmxa
@@ -92,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 29 2012 Richard W.M. Jones <rjones@redhat.com> - 7.0.2-1
+- New upstream version 7.0.2.
+- Rebuild for OCaml 4.00.1.
+- Fix homepage and source.
+- Clean up the spec file.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index cbb1042..ca1b3a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c854b3cb456a7622668ef16789eff52  release-6.2.5.tar.bz2
+412eec5674a8bab76ccd09e006a24e10  pcre-ocaml-7.0.2.tar.gz