Hello community,
here is the log from the commit of package ocaml-camomile for openSUSE:Factory
checked in at 2017-08-18 15:01:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-camomile (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camomile.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-camomile"
Fri Aug 18 15:01:20 2017 rev:2 rq:512519 version:0.8.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-camomile/ocaml-camomile.changes
2016-10-19 13:00:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-camomile.new/ocaml-camomile.changes
2017-08-18 15:01:25.563309206 +0200
@@ -1,0 +2,20 @@
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+Mon Jul 17 20:24:18 UTC 2017 - oher...@suse.de
+
+- Use explicit module signatures for ocaml-4.05
+
+-------------------------------------------------------------------
+Mon Jul 17 12:48:58 UTC 2017 - oher...@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+-------------------------------------------------------------------
+Mon Jul 17 10:48:58 UTC 2017 - oher...@suse.de
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-camomile.spec ++++++
--- /var/tmp/diff_new_pack.hxNOrg/_old 2017-08-18 15:01:27.363055854 +0200
+++ /var/tmp/diff_new_pack.hxNOrg/_new 2017-08-18 15:01:27.371054727 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-camomile
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
Name: ocaml-camomile
Version: 0.8.5
Release: 0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
Summary: Unicode library for OCaml
# Several files are MIT and UCD licensed, but the overall work is LGPLv2+
# and the LGPL/GPL supercedes compatible licenses.
# https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html
License: LGPL-2.0+
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Url: https://github.com/yoriyuki/Camomile/wiki
Source0: camomile-%{version}.tar.bz2
# Use ocamlopt -g option to enable debuginfo.
@@ -38,12 +38,6 @@
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.02.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-camomile
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
-%if 0%{?suse_version} < 1210
-Requires: ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-camomile
%description
Camomile is a Unicode library for ocaml. Camomile provides Unicode
@@ -53,7 +47,7 @@
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%description devel
@@ -62,7 +56,7 @@
%package data
Summary: Data files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%description data
@@ -75,38 +69,34 @@
%patch1 -p1
%patch2 -p1
-
%build
# Parallel builds don't work.
./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
make do_byte
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
make do_opt
%endif
make %{?_smp_mflags} dochtml
make %{?_smp_mflags} man
-
%install
export DESTDIR=%{buildroot}
export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR/stublibs $OCAMLFIND_DESTDIR/camomile
mkdir -p %{buildroot}%{_bindir}
make install prefix=%{buildroot}%{_prefix} DATADIR=%{buildroot}%{_datadir}
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
cp tools/camomilecharmap.opt %{buildroot}%{_bindir}/camomilecharmap
cp tools/camomilelocaledef.opt %{buildroot}%{_bindir}/camomilelocaledef
%endif
%fdupes %{buildroot}
-
-
%files
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_bindir}/camomilecharmap
%{_bindir}/camomilelocaledef
%endif
@@ -116,7 +106,7 @@
%doc README dochtml/*
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
++++++ ocaml-camomile.bytecode.patch ++++++
--- /var/tmp/diff_new_pack.hxNOrg/_old 2017-08-18 15:01:27.495037274 +0200
+++ /var/tmp/diff_new_pack.hxNOrg/_new 2017-08-18 15:01:27.495037274 +0200
@@ -2,10 +2,8 @@
Makefile.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
-Index: camomile-0.8.5/Makefile.in
-===================================================================
---- camomile-0.8.5.orig/Makefile.in
-+++ camomile-0.8.5/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -59,7 +59,7 @@ VERSION = @VERSION@
# Build procedure
###################################################################
@@ -34,3 +32,25 @@
NOOBJ_INT= \
public/unicodeString.cmi configInt.cmi internal/uReStrParserType.cmi
+--- a/internal/unimap.ml
++++ b/internal/unimap.ml
+@@ -58,7 +58,7 @@ val of_name : string -> t
+ end
+
+
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+
+ type mapping = {no_char : int; tbl : Tbl31.Bytes.t}
+
+--- a/public/uCharInfo.ml
++++ b/public/uCharInfo.ml
+@@ -298,7 +298,7 @@ val load_composition_exclusion_tbl : uni
+
+ end
+
+-module Make (Config : ConfigInt.Type) = struct
++module Make (Config : ConfigInt.Type) : Type = struct
+ include Unidata.Make(Config)
+
+ (* General category *)
