commit ocaml-camomile for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camomile for openSUSE:Factory
checked in at 2020-03-09 14:13:18
Comparing /work/SRC/openSUSE:Factory/ocaml-camomile (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camomile.new.26092 (New)
Package is "ocaml-camomile"
Mon Mar 9 14:13:18 2020 rev:5 rq:777966 version:1.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camomile/ocaml-camomile.changes
2019-11-12 16:11:36.591764639 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camomile.new.26092/ocaml-camomile.changes
2020-03-09 14:13:23.574506944 +0100
@@ -1,0 +2,7 @@
+Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Require current ocaml-rpm-macros
+- Remove zh__PINYIN locale in bytecode-only builds
+ code generator fails in bytecode with overflow
+
+---
Other differences:
--
++ ocaml-camomile.spec ++
--- /var/tmp/diff_new_pack.NtWO3E/_old 2020-03-09 14:13:24.318507434 +0100
+++ /var/tmp/diff_new_pack.NtWO3E/_new 2020-03-09 14:13:24.322507437 +0100
@@ -30,7 +30,7 @@
Source0:%{name}-%{version}.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20191101
+BuildRequires: ocaml-rpm-macros >= 20200220
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(str)
BuildRequires: ocamlfind(unix)
@@ -63,6 +63,23 @@
%autosetup -p1
%build
+if test -z "$(type -P ocaml.opt)"
+then
+ rm -fv Camomile/locales/zh__PINYIN.txt
+ for i in Camomile/locales/*.txt
+ do
+grep zh__PINYIN $i || continue
+sed -i~ '
+/zh__PINYIN/ d
+' $i
+diff -u "$_"~ "$_" && exit 1
+ done
+ if pushd 'Camomile/locales'
+ then
+ocaml dune_gen.ml > dune.inc
+popd
+ fi
+fi
dune_release_pkgs='camomile'
%ocaml_dune_setup
%ocaml_dune_build
commit ocaml-camomile for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camomile for openSUSE:Factory
checked in at 2019-11-12 16:11:34
Comparing /work/SRC/openSUSE:Factory/ocaml-camomile (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990 (New)
Package is "ocaml-camomile"
Tue Nov 12 16:11:34 2019 rev:4 rq:746692 version:1.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camomile/ocaml-camomile.changes
2019-10-24 23:02:47.404075943 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990/ocaml-camomile.changes
2019-11-12 16:11:36.591764639 +0100
@@ -1,0 +2,5 @@
+Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de
+
+- Require current dune macros
+
+---
Other differences:
--
++ ocaml-camomile.spec ++
--- /var/tmp/diff_new_pack.J3a3ly/_old 2019-11-12 16:11:37.151765240 +0100
+++ /var/tmp/diff_new_pack.J3a3ly/_new 2019-11-12 16:11:37.155765245 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -30,9 +30,10 @@
Source0:%{name}-%{version}.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20191009
+BuildRequires: ocaml-rpm-macros >= 20191101
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(str)
+BuildRequires: ocamlfind(unix)
%description
Camomile is a Unicode library for ocaml. Camomile provides Unicode
@@ -62,6 +63,7 @@
%autosetup -p1
%build
+dune_release_pkgs='camomile'
%ocaml_dune_setup
%ocaml_dune_build
@@ -70,7 +72,8 @@
%ocaml_create_file_list
%check
-%ocaml_dune_test || : make check failed
+dune_test_tolerate_fail='dune_test_tolerate_fail'
+%ocaml_dune_test
%files -f %{name}.files
commit ocaml-camomile for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-camomile for openSUSE:Factory
checked in at 2019-10-24 23:02:42
Comparing /work/SRC/openSUSE:Factory/ocaml-camomile (Old)
and /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990 (New)
Package is "ocaml-camomile"
Thu Oct 24 23:02:42 2019 rev:3 rq:738548 version:1.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-camomile/ocaml-camomile.changes
2017-08-18 15:01:25.563309206 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990/ocaml-camomile.changes
2019-10-24 23:02:47.404075943 +0200
@@ -1,0 +2,13 @@
+Mon Sep 30 12:34:56 UTC 2019 - oher...@suse.de
+
+- use dune macros from ocaml-rpm-macros
+
+---
+Mon Sep 23 16:35:39 UTC 2019 - oher...@suse.de
+
+- Update to version 1.0.2
+ Fix build
+ Remove camomile-0.8.3-enable-debug.patch
+ Remove ocaml-camomile.bytecode.patch
+
+---
Old:
camomile-0.8.3-enable-debug.patch
camomile-0.8.5.tar.bz2
ocaml-camomile.bytecode.patch
New:
_service
ocaml-camomile-1.0.2.tar.xz
Other differences:
--
++ ocaml-camomile.spec ++
--- /var/tmp/diff_new_pack.UBwTYo/_old 2019-10-24 23:02:48.228076904 +0200
+++ /var/tmp/diff_new_pack.UBwTYo/_new 2019-10-24 23:02:48.240076918 +0200
@@ -17,7 +17,7 @@
Name: ocaml-camomile
-Version:0.8.5
+Version:1.0.2
Release:0
%{?ocaml_preserve_bytecode}
Summary:Unicode library for OCaml
@@ -27,17 +27,12 @@
License:LGPL-2.0+
Group: Development/Languages/OCaml
Url:https://github.com/yoriyuki/Camomile/wiki
-Source0:camomile-%{version}.tar.bz2
-# Use ocamlopt -g option to enable debuginfo.
-Patch1: camomile-0.8.3-enable-debug.patch
-Patch2: ocaml-camomile.bytecode.patch
-BuildRequires: fdupes
-BuildRequires: ocaml >= 3.12.1-12
-BuildRequires: ocaml-camlp4-devel
-BuildRequires: ocaml-findlib-devel
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.02.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0:%{name}-%{version}.tar.xz
+BuildRequires: ocaml
+BuildRequires: ocaml-dune
+BuildRequires: ocaml-rpm-macros >= 20191009
+BuildRequires: ocamlfind(bigarray)
+BuildRequires: ocamlfind(str)
%description
Camomile is a Unicode library for ocaml. Camomile provides Unicode
@@ -64,61 +59,24 @@
applications that use %{name}.
%prep
-%setup -q -n camomile-%{version}
-
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
%build
-# Parallel builds don't work.
-./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
-make do_byte
-%if 0%{?ocaml_native_compiler}
-make do_opt
-%endif
-make %{?_smp_mflags} dochtml
-make %{?_smp_mflags} man
+%ocaml_dune_setup
+%ocaml_dune_build
%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 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 0%{?ocaml_native_compiler}
-%{_bindir}/camomilecharmap
-%{_bindir}/camomilelocaledef
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%doc README dochtml/*
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
+%ocaml_dune_install
+%ocaml_create_file_list
+
+%check
+%ocaml_dune_test || : make check failed
+
+%files -f %{name}.files
+
+%files devel -f %{name}.files.devel
%files data
-%defattr(-,root,root,-)
-%doc README
%{_datadir}/camomile/
%changelog
++ _service ++
https://github.com/yoriyuki/Camomile.git
git
1.0.2
1.0.2
ocaml-camomile
*.tar
xz
commit ocaml-camomile for openSUSE:Factory
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.0 +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/msg5.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 @@
%packagedevel
Summary:Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%descriptiondevel
@@ -62,7 +56,7 @@
%packagedata
Summary:Data files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%descriptiondata
@@ -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
++
