commit ocaml-curses for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-curses for openSUSE:Factory
checked in at 2019-11-13 13:26:13
Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old)
and /work/SRC/openSUSE:Factory/.ocaml-curses.new.2990 (New)
Package is "ocaml-curses"
Wed Nov 13 13:26:13 2019 rev:6 rq:747755 version:1.0.4
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes
2019-10-18 14:37:16.871638141 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-curses.new.2990/ocaml-curses.changes
2019-11-13 13:26:15.195568024 +0100
@@ -1,0 +2,8 @@
+Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de
+
+- Require current dune macros
+- Update to version 1.0.4, via _service file
+- Remove curses.const.patch
+- Remove curses.getsyx.patch
+
+---
Old:
curses.const.patch
curses.getsyx.patch
ocaml-curses-1.0.3.tar.gz
New:
_service
ocaml-curses-1.0.4.tar.xz
Other differences:
--
++ ocaml-curses.spec ++
--- /var/tmp/diff_new_pack.2ZCmXo/_old 2019-11-13 13:26:16.775569668 +0100
+++ /var/tmp/diff_new_pack.2ZCmXo/_new 2019-11-13 13:26:16.779569673 +0100
@@ -12,27 +12,25 @@
# 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/
#
Name: ocaml-curses
-Version:1.0.3
+Version:1.0.4
Release:0
%{?ocaml_preserve_bytecode}
Summary:OCaml bindings for ncurses
License:LGPL-2.1+
Group: Development/Languages/OCaml
Url:http://savannah.nongnu.org/projects/ocaml-tmk/
-Source0:
http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
-Patch0: curses.const.patch
-Patch1: curses.getsyx.patch
+Source0:%{name}-%{version}.tar.xz
BuildRequires: ncurses-devel
BuildRequires: ocaml
-BuildRequires: ocaml-oasis
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 20191009
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: ocaml-dune
+BuildRequires: ocaml-rpm-macros >= 20191101
+BuildRequires: ocamlfind(dune.configurator)
+BuildRequires: pkg-config
%description
OCaml bindings for ncurses.
@@ -41,6 +39,7 @@
Summary:Development files for %{name}
Group: Development/Languages/OCaml
Requires: %{name} = %{version}
+Requires: ncurses-devel
%descriptiondevel
The %{name}-devel package contains libraries and signature files for
@@ -50,61 +49,20 @@
%autosetup -p1
%build
-sed 's/@BOOL_WIDE_CURSES@/true/' config.ml.in | tee config.ml
-gcc -x c -E curses.ml | tee curses.ml~
-mv -v curses.ml~ curses.ml
-tee -a config.h <<_EOF_
-#define CURSES_HEADER
-#define CURSES_TERM_H
-#define HAVE_TERMIOS_H 1
-#define HAVE_SYS_IOCTL_H 1
-_EOF_
-rm -fv setup.ml myocamlbuild.ml META* _* */_*
-# obs service changes every ^Version line ...
-sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
-OASISFormat: 0.4
-Name:curses
-Version: 0
-Synopsis:OCaml bindings for ncurses
-Authors: Paul Pelzl
-License: %{license}
-LicenseFile: LICENSE
-Plugins: META(`oasis version`)
-BuildTools: ocamlbuild
-
-Library curses
- Path: .
- Install: true
- Modules: Curses
- CSources: ml_curses.c, config.h
- CCOpt: %{optflags} -fPIC -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
- CCLib: -lncursesw
-
-Document curses
- Title:API reference for curses
- Type: ocamlbuild
- BuildTools+: ocamldoc
- InstallDir: \$htmldir
- Install: true
- XOCamlbuildPath: .
- XOCamlbuildLibraries: curses
-_EOF_
-%oasis_setup
-%ocaml_oasis_configure --enable-docs
-%ocaml_oasis_build
-%ocaml_oasis_doc
+dune_release_pkgs='curses'
+%ocaml_dune_setup
+%ocaml_dune_build
%install
-%ocaml_oasis_findlib_install
+%ocaml_dune_install
%ocaml_create_file_list
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%check
+dune_test_tolerate_fail='dune_test_tolerate_fail'
+%ocaml_dune_test
%files -f %{name}.files
%files devel -f %{name}.files.devel
-%{oasis_docdir_html}
%changelog
++ _service ++
https://github.com/olafhering/ocaml-curses.git
git
1.0.4
dune-wip
ocaml-curses
*.tar
xz
commit ocaml-curses for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-curses for openSUSE:Factory
checked in at 2019-10-18 14:37:05
Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old)
and /work/SRC/openSUSE:Factory/.ocaml-curses.new.2352 (New)
Package is "ocaml-curses"
Fri Oct 18 14:37:05 2019 rev:5 rq:740990 version:1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes
2017-08-18 15:01:35.393925338 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-curses.new.2352/ocaml-curses.changes
2019-10-18 14:37:16.871638141 +0200
@@ -1,0 +2,5 @@
+Wed Oct 9 05:48:16 UTC 2019 - oher...@suse.de
+
+- use macros from ocaml-rpm-macros
+
+---
Other differences:
--
++ ocaml-curses.spec ++
--- /var/tmp/diff_new_pack.QIedA6/_old 2019-10-18 14:37:17.991635225 +0200
+++ /var/tmp/diff_new_pack.QIedA6/_new 2019-10-18 14:37:17.991635225 +0200
@@ -31,7 +31,7 @@
BuildRequires: ocaml
BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.03
+BuildRequires: ocaml-rpm-macros >= 20191009
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,9 +47,7 @@
developing applications that use %{name}.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%build
sed 's/@BOOL_WIDE_CURSES@/true/' config.ml.in | tee config.ml
@@ -98,43 +96,15 @@
%install
%ocaml_oasis_findlib_install
-#
-mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/curses
-_EOF_
-#
+%ocaml_create_file_list
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
-%defattr(-,root,root,-)
-%doc COPYING
-/etc/ld.so.conf.d/*.conf
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-%{_libdir}/ocaml/*/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%doc COPYING
+%files -f %{name}.files
+
+%files devel -f %{name}.files.devel
%{oasis_docdir_html}
-%dir %{_libdir}/ocaml/*
-%{_libdir}/ocaml/*/*.a
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.annot
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
%changelog
commit ocaml-curses for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-curses for openSUSE:Factory
checked in at 2017-08-18 15:01:31
Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old)
and /work/SRC/openSUSE:Factory/.ocaml-curses.new (New)
Package is "ocaml-curses"
Fri Aug 18 15:01:31 2017 rev:4 rq:512522 version:1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes
2017-06-08 15:02:53.911908998 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-curses.new/ocaml-curses.changes
2017-08-18 15:01:35.393925338 +0200
@@ -1,0 +2,15 @@
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+---
+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-curses.spec ++
--- /var/tmp/diff_new_pack.4Vth7k/_old 2017-08-18 15:01:36.785729413 +0200
+++ /var/tmp/diff_new_pack.4Vth7k/_new 2017-08-18 15:01:36.809726035 +0200
@@ -19,10 +19,10 @@
Name: ocaml-curses
Version:1.0.3
Release:0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
Summary:OCaml bindings for ncurses
License:LGPL-2.1+
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Url:http://savannah.nongnu.org/projects/ocaml-tmk/
Source0:
http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
Patch0: curses.const.patch
@@ -33,19 +33,13 @@
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-curses
-# 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-curses
%description
OCaml bindings for ncurses.
%packagedevel
Summary:Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%descriptiondevel
@@ -85,7 +79,7 @@
Install: true
Modules: Curses
CSources: ml_curses.c, config.h
- CCOpt: -Wall -O2 -g -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
+ CCOpt: %{optflags} -fPIC -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
CCLib: -lncursesw
Document curses
@@ -106,7 +100,7 @@
%ocaml_oasis_findlib_install
#
mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}-stub.conf <<_EOF_
+tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
%{_libdir}/ocaml/curses
_EOF_
#
@@ -120,7 +114,7 @@
%doc COPYING
/etc/ld.so.conf.d/*.conf
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs
%endif
%{_libdir}/ocaml/*/*.so
@@ -131,7 +125,7 @@
%{oasis_docdir_html}
%dir %{_libdir}/ocaml/*
%{_libdir}/ocaml/*/*.a
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
%endif
commit ocaml-curses for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-curses for openSUSE:Factory
checked in at 2017-06-08 15:02:50
Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old)
and /work/SRC/openSUSE:Factory/.ocaml-curses.new (New)
Package is "ocaml-curses"
Thu Jun 8 15:02:50 2017 rev:3 rq:501575 version:1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes
2017-05-16 14:45:02.032152271 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-curses.new/ocaml-curses.changes
2017-06-08 15:02:53.911908998 +0200
@@ -1,0 +2,5 @@
+Wed May 31 07:07:33 UTC 2017 - o...@aepfle.de
+
+- Replace tabs with spaces in generated _oasis file
+
+---
Other differences:
--
++ ocaml-curses.spec ++
--- /var/tmp/diff_new_pack.WZEYwB/_old 2017-06-08 15:02:54.823780307 +0200
+++ /var/tmp/diff_new_pack.WZEYwB/_new 2017-06-08 15:02:54.827779742 +0200
@@ -75,7 +75,7 @@
Version: 0
Synopsis:OCaml bindings for ncurses
Authors: Paul Pelzl
-License: LGPL-2.1+
+License: %{license}
LicenseFile: LICENSE
Plugins: META(`oasis version`)
BuildTools: ocamlbuild
commit ocaml-curses for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-curses for openSUSE:Factory
checked in at 2017-05-16 14:44:08
Comparing /work/SRC/openSUSE:Factory/ocaml-curses (Old)
and /work/SRC/openSUSE:Factory/.ocaml-curses.new (New)
Package is "ocaml-curses"
Tue May 16 14:44:08 2017 rev:2 rq:494581 version:1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-curses/ocaml-curses.changes
2016-10-19 13:01:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-curses.new/ocaml-curses.changes
2017-05-16 14:45:02.032152271 +0200
@@ -1,0 +2,7 @@
+Wed May 10 08:23:44 UTC 2017 - oher...@suse.de
+
+- use oasis instead of autotools to fix bytecode (bsc#1031359)
+ add curses.const.patch
+ add curses.getsyx.patch
+
+---
New:
curses.const.patch
curses.getsyx.patch
Other differences:
--
++ ocaml-curses.spec ++
--- /var/tmp/diff_new_pack.K0XnMn/_old 2017-05-16 14:45:02.792045499 +0200
+++ /var/tmp/diff_new_pack.K0XnMn/_new 2017-05-16 14:45:02.796044937 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-curses
#
-# 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
@@ -25,15 +25,13 @@
Group: Development/Libraries/Other
Url:http://savannah.nongnu.org/projects/ocaml-tmk/
Source0:
http://download.savannah.gnu.org/releases/ocaml-tmk/%{name}-%{version}.tar.gz
-# Doesn't include a configure script, so we have to make one.
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gawk
-BuildRequires: libtool
+Patch0: curses.const.patch
+Patch1: curses.getsyx.patch
BuildRequires: ncurses-devel
-BuildRequires: ocaml >= 4.00.1
-BuildRequires: ocaml-rpm-macros >= 4.02.1
-BuildRequires: ocaml-findlib-devel >= 1.3.3-3
+BuildRequires: ocaml
+BuildRequires: ocaml-oasis
+BuildRequires: ocaml-ocamldoc
+BuildRequires: ocaml-rpm-macros >= 4.03
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ocaml autodep start for pkg: ocaml-curses
# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
@@ -56,32 +54,60 @@
%prep
%setup -q
-
+%patch0 -p1
+%patch1 -p1
%build
-autoreconf
-# Parallel builds don't work (with bytecode)
-%configure --enable-widec
-make all
-%if %{ocaml_native_compiler}
-make opt
-%endif
-
+sed 's/@BOOL_WIDE_CURSES@/true/' config.ml.in | tee config.ml
+gcc -x c -E curses.ml | tee curses.ml~
+mv -v curses.ml~ curses.ml
+tee -a config.h <<_EOF_
+#define CURSES_HEADER
+#define CURSES_TERM_H
+#define HAVE_TERMIOS_H 1
+#define HAVE_SYS_IOCTL_H 1
+_EOF_
+rm -fv setup.ml myocamlbuild.ml META* _* */_*
+# obs service changes every ^Version line ...
+sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
+OASISFormat: 0.4
+Name:curses
+Version: 0
+Synopsis:OCaml bindings for ncurses
+Authors: Paul Pelzl
+License: LGPL-2.1+
+LicenseFile: LICENSE
+Plugins: META(`oasis version`)
+BuildTools: ocamlbuild
+
+Library curses
+ Path: .
+ Install: true
+ Modules: Curses
+ CSources: ml_curses.c, config.h
+ CCOpt: -Wall -O2 -g -I$PWD -Werror -D_GNU_SOURCE -DHAVE_CONFIG_H
+ CCLib: -lncursesw
+
+Document curses
+ Title:API reference for curses
+ Type: ocamlbuild
+ BuildTools+: ocamldoc
+ InstallDir: \$htmldir
+ Install: true
+ XOCamlbuildPath: .
+ XOCamlbuildLibraries: curses
+_EOF_
+%oasis_setup
+%ocaml_oasis_configure --enable-docs
+%ocaml_oasis_build
+%ocaml_oasis_doc
%install
-
-export DESTDIR=%{buildroot}
-export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-export OCAMLFILES="curses META *.cmi *.cma *.so *.mli"
-%if %{ocaml_native_compiler}
-export OCAMLFILES="$OCAMLFILES *.cmx *.cmxa *.a"
-%endif
-ocamlfind install $OCAMLFILES
+%ocaml_oasis_findlib_install
#
mkdir -vp %{buildroot}/etc/ld.so.conf.d/
tee %{buildroot}/etc/ld.so.conf.d/%{name}-stub.conf <<_EOF_
-%{_libdir}/ocaml/stublibs
+%{_libdir}/ocaml/curses
_EOF_
#
@@ -89,28 +115,31 @@
%postun -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
%doc COPYING
/etc/ld.so.conf.d/*.conf
-%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
+%if %{ocaml_native_compiler}
+%{_libdir}/ocaml/*/*.cmxs
+%endif
%{_libdir}/ocaml/*/*.so
-%{_libdir}/ocaml/*/*.so.owner
%files devel
%defattr(-,root,root,-)
%doc COPYING
-%dir %{_libdir}/ocaml
+%{oasis_docdir_html}
%dir %{_libdir}/ocaml/*
-%if
