- updated deps and files

- rel 1

diff --git a/ocaml-lablgtk3.spec b/ocaml-lablgtk3.spec
index d59ca22bc63bd2a021472cedd26a6ced19f0f6cb..2f32aa1b4ec74f83fe78c2f9c1d6699f26055c07 100644 (file)
--- a/ocaml-lablgtk3.spec
+++ b/ocaml-lablgtk3.spec
@@ -3,27 +3,28 @@
 %bcond_without ocaml_opt       # skip building native optimized binaries (bytecode is always built)
 #
 # not yet available on x32 (ocaml 4.02.1), update when upstream will support it
-%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9 
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
 %undefine      with_ocaml_opt
 %endif
 
-%define                ocaml_ver       1:3.09.2
+%define                ocaml_ver       1:4.05.0
 Summary:       GTK+3 binding for OCaml
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla
 Name:          ocaml-lablgtk3
 Version:       3.1.1
-Release:       0.1
+Release:       1
 License:       LGPL with linking exceptions
 Group:         Libraries
 Source0:       https://github.com/garrigue/lablgtk/archive/%{version}/lablgtk-%{version}.tar.gz
 # Source0-md5: c55c37b3ff0eaa2563f07a3fe01f9243
 URL:           http://lablgtk.forge.ocamlcore.org/
-BuildRequires: gtk+3-devel
-BuildRequires: gtkspell3-devel
+BuildRequires: camlp5
+BuildRequires: gtk+3-devel >= 3.18
 BuildRequires: gtksourceview3-devel
-BuildRequires: ocaml-camlp4 >= %{ocaml_ver}
-BuildRequires: ocaml-dune
+BuildRequires: gtkspell3-devel
+BuildRequires: help2man
 BuildRequires: ocaml-cairo2-devel >= 0.6
+BuildRequires: ocaml-dune >= 1.8
 %requires_eq   ocaml-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,7 +41,8 @@ Summary:      GTK+3 binding for OCaml - development part
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla - cześć programistyczna
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%requires_eq   ocaml
+Requires:      %{name}-tools = %{version}-%{release}
+%requires_eq ocaml
 
 %description devel
 GTK+3 binding for OCaml. This package contains files needed to develop
@@ -55,7 +57,7 @@ Summary:      GTK+3 binding for OCaml - GtkSpell support
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla - obsługa GtkSpella
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-%requires_eq   ocaml-runtime
+%requires_eq ocaml-runtime
 
 %description gtkspell
 GTK+3 binding for OCaml, GtkSpell support.
@@ -68,7 +70,7 @@ Summary:      GTK+3 binding for OCaml - GtkSpell support, development part
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla - obsługa GtkSpella, część programistyczna
 Group:         Development/Libraries
 Requires:      %{name}-gtkspell = %{version}-%{release}
-%requires_eq   ocaml
+%requires_eq ocaml
 
 %description gtkspell-devel
 GTK+3 binding for OCaml, GtkSpell support. This package contains files
@@ -83,7 +85,7 @@ Summary:      GTK+3 binding for OCaml - GtkSourceView support
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla - wsparcie dla GtkSourceView
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-%requires_eq   ocaml
+%requires_eq ocaml
 
 %description gtksourceview
 GTK+3 binding for OCaml, GtkSourceView support. This package contains
@@ -100,7 +102,7 @@ Summary:    GTK+3 binding for OCaml - GtkSourceView support, development part
 Summary(pl.UTF-8):     Wiązania GTK+3 dla OCamla - wsparcie dla GtkSourceView, część programistyczna
 Group:         Development/Libraries
 Requires:      %{name}-gtksourceview = %{version}-%{release}
-%requires_eq   ocaml
+%requires_eq ocaml
 
 %description gtksourceview-devel
 GTK+3 binding for OCaml, GtkSourceView support. This package contains
@@ -111,20 +113,42 @@ Wiązania GTK+3 dla OCamla, wsparcie dla GtkSourceView. Pakiet ten
 zawiera pliki niezbędne do tworzenia programów używających
 LablGtk-GtkSourceView.
 
+%package tools
+Summary:       GTK+ binding for OCaml - tools
+Summary(pl.UTF-8):     Wiązania GTK+ dla OCamla - narzędzia
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+%requires_eq ocaml
+
+%description tools
+GTK+ binding for OCaml. This package contains tools for working with
+lablgtk.
+
+%description tools -l pl.UTF-8
+Wiązania GTK+ dla OCamla. Pakiet ten zawiera narzędzia do pracy z
+lablgtk.
+
 %prep
 %setup -q -n lablgtk-%{version}
 
 %build
 dune build %{?_smp_mflags}
 
+help2man -N --version-string=%{version} -o gdk_pixbuf_mlsource3.1 _build/install/default/bin/gdk_pixbuf_mlsource3
+help2man -N --version-string=%{version} -o lablgladecc3.1 _build/install/default/bin/lablgladecc3
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/ocaml/stublibs,%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/ocaml/stublibs,%{_examplesdir}/%{name}-%{version}}
 
 dune install --destdir=$RPM_BUILD_ROOT
 
+cp -p gdk_pixbuf_mlsource3.1 lablgladecc3.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk3*/*.ml
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES.md README.md
 %dir %{_libdir}/ocaml/lablgtk3
+%{_libdir}/ocaml/lablgtk3/META
 %{_libdir}/ocaml/lablgtk3/lablgtk3.cma
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/lablgtk3/lablgtk3.cmxs
@@ -140,34 +165,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/ocaml/lablgtk3/g[ABCDEFLMOPRTUW]*.cmi
-%{_libdir}/ocaml/lablgtk3/gaux.cmi
-%{_libdir}/ocaml/lablgtk3/gdk*.cmi
-%{_libdir}/ocaml/lablgtk3/glib.cmi
-%{_libdir}/ocaml/lablgtk3/gobject.cmi
-%{_libdir}/ocaml/lablgtk3/gpointer.cmi
-%{_libdir}/ocaml/lablgtk3/gtk.cmi
-%{_libdir}/ocaml/lablgtk3/gtk[ABDEFILMNOPRTW]*.cmi
-%{_libdir}/ocaml/lablgtk3/gtkSignal.cmi
-%{_libdir}/ocaml/lablgtk3/gtkStock.cmi
-%{_libdir}/ocaml/lablgtk3/gutf8.cmi
-%{_libdir}/ocaml/lablgtk3/ogtk*.cmi
-%{_libdir}/ocaml/lablgtk3/pango*.cmi
+%{_libdir}/ocaml/lablgtk3/*.cmi
+%{_libdir}/ocaml/lablgtk3/*.cmt
+%{_libdir}/ocaml/lablgtk3/*.cmti
+%{_libdir}/ocaml/lablgtk3/*.mli
 %{_libdir}/ocaml/lablgtk3/liblablgtk3_stubs.a
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/lablgtk3/g[ABCDEFLMOPRTUW]*.cmx
-%{_libdir}/ocaml/lablgtk3/gaux.cmx
-%{_libdir}/ocaml/lablgtk3/gdk*.cmx
-%{_libdir}/ocaml/lablgtk3/glib.cmx
-%{_libdir}/ocaml/lablgtk3/gobject.cmx
-%{_libdir}/ocaml/lablgtk3/gpointer.cmx
-%{_libdir}/ocaml/lablgtk3/gtk.cmx
-%{_libdir}/ocaml/lablgtk3/gtk[ABDEFILMNOPRTW]*.cmx
-%{_libdir}/ocaml/lablgtk3/gtkSignal.cmx
-%{_libdir}/ocaml/lablgtk3/gtkStock.cmx
-%{_libdir}/ocaml/lablgtk3/gutf8.cmx
-%{_libdir}/ocaml/lablgtk3/ogtk*.cmx
-%{_libdir}/ocaml/lablgtk3/pango*.cmx
+%{_libdir}/ocaml/lablgtk3/*.cmx
 %{_libdir}/ocaml/lablgtk3/lablgtk3.a
 %{_libdir}/ocaml/lablgtk3/lablgtk3.cmxa
 %endif
@@ -176,10 +180,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/lablgtk3/ml_*.h
 %{_libdir}/ocaml/lablgtk3/pango_tags.h
 %{_libdir}/ocaml/lablgtk3/wrappers.h
+%{_libdir}/ocaml/lablgtk3/dune-package
+%{_libdir}/ocaml/lablgtk3/opam
 %{_examplesdir}/%{name}-%{version}
 
 %files gtkspell
 %defattr(644,root,root,755)
+%dir %{_libdir}/ocaml/lablgtk3-gtkspell3
+%{_libdir}/ocaml/lablgtk3-gtkspell3/META
 %{_libdir}/ocaml/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cma
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxs
@@ -188,16 +196,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtkspell-devel
 %defattr(644,root,root,755)
-%{_libdir}/ocaml/lablgtk3-gtkspell3/gtkSpell.cmi
+%{_libdir}/ocaml/lablgtk3-gtkspell3/*.cmi
+%{_libdir}/ocaml/lablgtk3-gtkspell3/*.cmt
+%{_libdir}/ocaml/lablgtk3-gtkspell3/*.cmti
+%{_libdir}/ocaml/lablgtk3-gtkspell3/*.mli
 %{_libdir}/ocaml/lablgtk3-gtkspell3/liblablgtk3_gtkspell3_stubs.a
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/lablgtk3-gtkspell3/gtkSpell.cmx
+%{_libdir}/ocaml/lablgtk3-gtkspell3/*.cmx
 %{_libdir}/ocaml/lablgtk3-gtkspell3/lablgtk3_gtkspell3.a
 %{_libdir}/ocaml/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxa
 %endif
+%{_libdir}/ocaml/lablgtk3-gtkspell3/dune-package
+%{_libdir}/ocaml/lablgtk3-gtkspell3/opam
 
 %files gtksourceview
 %defattr(644,root,root,755)
+%dir %{_libdir}/ocaml/lablgtk3-sourceview3
+%{_libdir}/ocaml/lablgtk3-sourceview3/META
 %{_libdir}/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxs
@@ -206,14 +221,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtksourceview-devel
 %defattr(644,root,root,755)
-%{_libdir}/ocaml/lablgtk3-sourceview3/gSourceView3.cmi
-%{_libdir}/ocaml/lablgtk3-sourceview3/gtkSourceView3.cmi
-%{_libdir}/ocaml/lablgtk3-sourceview3/sourceView3Enums.cmi
+%{_libdir}/ocaml/lablgtk3-sourceview3/*.cmi
+%{_libdir}/ocaml/lablgtk3-sourceview3/*.cmt
+%{_libdir}/ocaml/lablgtk3-sourceview3/*.cmti
+%{_libdir}/ocaml/lablgtk3-sourceview3/*.mli
 %{_libdir}/ocaml/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/lablgtk3-sourceview3/gSourceView3.cmx
-%{_libdir}/ocaml/lablgtk3-sourceview3/gtkSourceView3.cmx
-%{_libdir}/ocaml/lablgtk3-sourceview3/sourceView3Enums.cmx
+%{_libdir}/ocaml/lablgtk3-sourceview3/*.cmx
 %{_libdir}/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.a
 %{_libdir}/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
 %endif
+%{_libdir}/ocaml/lablgtk3-sourceview3/dune-package
+%{_libdir}/ocaml/lablgtk3-sourceview3/opam
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gdk_pixbuf_mlsource3
+%attr(755,root,root) %{_bindir}/lablgladecc3
+%{_mandir}/man1/gdk_pixbuf_mlsource3.1*
+%{_mandir}/man1/lablgladecc3.1*