diff --git a/ocaml-pcre.changes b/ocaml-pcre.changes index 28eadd0..af67198 100644 --- a/ocaml-pcre.changes +++ b/ocaml-pcre.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Sep 17 16:06:58 CEST 2012 - ohering@suse.de + +- Update to version 7.0.2 + Added --with-pcre-config flag to configure location of PCRE configuration generator. + Upgraded to OCaml 4.00 + Switched to Oasis for packaging + Switched to OCamlBuild for the build process + Rewrote README in Markdown + Added stricter compilation flags + Minor bugfixes + Fixed native code debug build target by updating OCamlMakefile. + Fixed a Windows portability bug in the C-bindings. + Updated OCamlMakefile to fix linking order. + ------------------------------------------------------------------- Tue Jul 5 20:00:55 UTC 2011 - ampsaltis@gmail.com diff --git a/ocaml-pcre.spec b/ocaml-pcre.spec index 1cd9a95..958bf54 100644 --- a/ocaml-pcre.spec +++ b/ocaml-pcre.spec @@ -28,22 +28,20 @@ # norootforbuild -%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -#%%define debug_package %{nil} - Name: ocaml-pcre -Version: 6.2.2 +Version: 7.0.2 Release: 1 Summary: Perl compatibility regular expressions (PCRE) for OCaml Group: Development/Libraries/Other -License: LGPLv2 +License: LGPL-2.0 URL: http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml -Source0: http://hg.ocaml.info/release/pcre-ocaml/archive/release-%{version}.tar.bz2 +Source0: https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml >= 3.10.2 +BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel BuildRequires: pcre-devel BuildRequires: gawk @@ -66,28 +64,18 @@ developing applications that use %{name}. %prep -%setup -q -n pcre-ocaml-release-%{version} +%setup -q -n pcre-ocaml-%{version} %build -%if %opt +make setup.data CONFIGUREFLAGS="--destdir $RPM_BUILD_ROOT --docdir %{_defaultdocdir}/%{name}" make all -%else -make -C lib byte-code-library -%endif -strip 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 -%if %opt make NATIVE=true install -%else -make LIBINSTALL_FILES="pcre.mli pcre.cmi pcre.cma libpcre_stubs.a dllpcre_stubs.so" install -%endif %clean @@ -96,12 +84,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE README.txt +%doc COPYING.txt README.md %{_libdir}/ocaml/pcre -%if %opt %exclude %{_libdir}/ocaml/pcre/*.a +%exclude %{_libdir}/ocaml/pcre/*.cmx %exclude %{_libdir}/ocaml/pcre/*.cmxa -%endif %exclude %{_libdir}/ocaml/pcre/*.mli %{_libdir}/ocaml/stublibs/*.so %{_libdir}/ocaml/stublibs/*.so.owner @@ -109,11 +96,9 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc LICENSE README.txt -%if %opt %{_libdir}/ocaml/pcre/*.a +%{_libdir}/ocaml/pcre/*.cmx %{_libdir}/ocaml/pcre/*.cmxa -%endif %{_libdir}/ocaml/pcre/*.mli diff --git a/pcre-ocaml-7.0.2.tar.bz2 b/pcre-ocaml-7.0.2.tar.bz2 new file mode 100644 index 0000000..ad92202 --- /dev/null +++ b/pcre-ocaml-7.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1450eb2ad18f49e6f9deaf88cbe0492eff6d892b3e3d5ef29810a1b98c67f89 +size 71826 diff --git a/release-6.2.2.tar.bz2 b/release-6.2.2.tar.bz2 deleted file mode 100644 index 8c5f637..0000000 --- a/release-6.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02b08d3a15bcfea22ac309a747f881bb947c7e1f90c85c9c6927a908cb8a8927 -size 53088