- updated to 1.5.1

- added destdir patch (adjust ocamlfind install invocation wrt. DESTDIR)
- added bytes patch (look also for bytes module provided by transitional package)

diff --git a/ocaml-findlib-bytes.patch b/ocaml-findlib-bytes.patch
new file mode 100644 (file)
index 0000000..db2024b
--- /dev/null
+++ b/ocaml-findlib-bytes.patch
@@ -0,0 +1,11 @@
+--- findlib-1.5.1/configure.orig       2014-06-25 12:23:05.000000000 +0200
++++ findlib-1.5.1/configure    2014-06-28 21:18:46.656078343 +0200
+@@ -489,7 +489,7 @@
+ 
+ # bytes?
+ 
+-if [ -f "${ocaml_core_stdlib}/bytes.cmi" ]; then
++if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o -f "${ocaml_core_stdlib}/bytes/bytes.cmi" ]; then
+     echo "bytes: found, installing fake library"
+     lbytes="bytes"
+     cbytes=0

diff --git a/ocaml-findlib-destdir.patch b/ocaml-findlib-destdir.patch
new file mode 100644 (file)
index 0000000..3874398
--- /dev/null
+++ b/ocaml-findlib-destdir.patch
@@ -0,0 +1,19 @@
+--- findlib-1.5.1/src/bytes/Makefile.orig      2014-06-25 12:23:06.000000000 +0200
++++ findlib-1.5.1/src/bytes/Makefile   2014-06-28 20:37:24.619463407 +0200
+@@ -1,6 +1,7 @@
+ BYTE_FILES=bytes.cmi bytes.cma
+ NATIVE_FILES=bytes.cmx bytes.cmxa bytes.a bytes.cmxs
+ OCAMLBUILD=ocamlbuild -classic-display -no-links
++PKGDIR=$(shell ocamlfind printconf destdir)
+ 
+ build: all opt
+ 
+@@ -11,7 +12,7 @@
+       $(OCAMLBUILD) $(NATIVE_FILES)
+ 
+ install: all
+-      cd _build/ && ocamlfind install bytes ../META $(BYTE_FILES) -optional $(NATIVE_FILES)
++      cd _build/ && ocamlfind install bytes ../META $(BYTE_FILES) -optional $(NATIVE_FILES) -destdir $(prefix)/$(PKGDIR)
+ 
+ uninstall:
+       ocamlfind remove bytes

diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 1779e66624be854a4559c69f4b0b2a82d384670a..a67c3932577a8ce339791af1330f8539b113505a 100644 (file)
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -2,16 +2,19 @@
 Summary:       OCaml module manager
 Summary(pl.UTF-8):     Zarządca modułów OCamla
 Name:          ocaml-findlib
-Version:       1.4.1
+Version:       1.5.1
 Release:       1
 License:       distributable
 Group:         Development/Tools
 Source0:       http://download.camlcity.org/download/findlib-%{version}.tar.gz
-# Source0-md5: 5d258142e9a7db98bb3553dbca739af8
+# Source0-md5: 6bf0d0da66104bc8bdcb3018bd13a202
+Patch0:                %{name}-destdir.patch
+Patch1:                %{name}-bytes.patch
 URL:           http://www.ocaml-programming.de/packages/
 BuildRequires: m4
 BuildRequires: ncurses-devel
 BuildRequires: ocaml >= %{ocaml_ver}
+BuildRequires: ocaml-bytes-devel
 BuildRequires: ocaml-camlp4
 BuildRequires: ocaml-labltk-devel
 BuildRequires: sed >= 4.0
@@ -35,6 +38,7 @@ Summary:      OCaml module manager
 Summary(pl.UTF-8):     Zarządca modułów OCamla
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      ocaml-bytes-devel
 
 %description devel
 The "findlib" library provides a scheme to manage reusable software
@@ -54,12 +58,15 @@ Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba.
 
 %prep
 %setup -q -n findlib-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 ./configure \
        -bindir %{_bindir} \
        -mandir %{_mandir} \
-       -config %{_sysconfdir}/ocamlfind.conf
+       -config %{_sysconfdir}/ocamlfind.conf \
+       -with-toolbox
 
 sed -i -e 's/-g//' Makefile
 
@@ -73,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli
 
+# fake, the real one is already provided by ocaml-bytes
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/bytes/META
+
 # in PLD only META files are stored in site-lib/pkg
 sed -i -e 's|/site-lib||' $RPM_BUILD_ROOT%{_libdir}/ocaml/topfind
 ln -sf topfind $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlfind
@@ -103,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ocamlfind
 %attr(755,root,root) %{_bindir}/safe_camlp4
 %config %{_sysconfdir}/ocamlfind.conf
+%dir %{_libdir}/ocaml/findlib
+%attr(755,root,root) %{_libdir}/ocaml/findlib/make_wizard
+%{_libdir}/ocaml/findlib/make_wizard.pattern
 %{_libdir}/ocaml/site-lib/findlib
 # symlinks
 %{_libdir}/ocaml/site-lib/libexec
@@ -128,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_libdir}/ocaml/findlib
 %{_libdir}/ocaml/findlib/Makefile.config
 %{_libdir}/ocaml/findlib/*.cm[ixa]*
 %{_libdir}/ocaml/findlib/*.a