Hello community, here is the log from the commit of package ocaml-lablgl for openSUSE:Factory checked in at 2019-11-12 16:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-lablgl (Old) and /work/SRC/openSUSE:Factory/.ocaml-lablgl.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-lablgl" Tue Nov 12 16:12:16 2019 rev:5 rq:747693 version:1.06 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-lablgl/ocaml-lablgl.changes 2019-10-27 13:40:39.089240749 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-lablgl.new.2990/ocaml-lablgl.changes 2019-11-12 16:12:17.919809053 +0100 @@ -1,0 +2,5 @@ +Fri Nov 1 12:34:56 UTC 2019 - [email protected] + +- Require current dune macros + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgl.spec ++++++ --- /var/tmp/diff_new_pack.TGVGN7/_old 2019-11-12 16:12:18.363809530 +0100 +++ /var/tmp/diff_new_pack.TGVGN7/_new 2019-11-12 16:12:18.367809534 +0100 @@ -13,7 +13,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/ # @@ -21,23 +21,18 @@ Version: 1.06 Release: 0 %{?ocaml_preserve_bytecode} - -Summary: LablGL is an OpenGL interface for Objective Caml +Summary: An openGL interface for OCaml License: BSD-3-Clause Group: Development/Languages/OCaml - Url: https://github.com/garrigue/lablgl Source0: %{name}-%{version}.tar.xz - BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-camlp5-devel -BuildRequires: ocaml-labltk-devel -BuildRequires: ocaml-rpm-macros >= 20191004 -BuildRequires: pkg-config +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocamlfind(camlp5) +BuildRequires: ocamlfind(dune.configurator) +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(freeglut) -BuildRequires: pkgconfig(xmu) %description LablGL is is an Objective Caml interface to OpenGL. Support is @@ -46,107 +41,31 @@ implementations (SGI, Digital Unix, Solaris...), with XFree86 GLX extension, or with open-source Mesa. - %package devel Summary: Development files for %{name} Group: Development/Languages/OCaml Requires: %{name} = %{version} -Requires: ocaml-labltk-devel %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. - %prep %autosetup -p1 %build -tee Makefile.config <<EOF -%if 0%{?ocaml_native_compiler} -CAMLC = ocamlc.opt -CAMLOPT = ocamlopt.opt -%else -CAMLC = ocamlc -CAMLOPT = ocamlc -%endif -BINDIR = %{_bindir} -XINCLUDES = $(pkg-config --cflags xmu) -XLIBS = $(pkg-config --libs xmu) -TKINCLUDES = -I%{_includedir} -GLINCLUDES = $(pkg-config --cflags glu) -GLLIBS = $(pkg-config --libs glu) -GLUTLIBS = $(pkg-config --libs freeglut || echo '-lglut') -RANLIB = : -LIBDIR = %{_libdir}/ocaml -DLLDIR = %{_libdir}/ocaml/stublibs -INSTALLDIR = %{_libdir}/ocaml/lablGL -TOGLDIR=Togl -COPTS = $RPM_OPT_FLAGS -EOF - -make all -%if 0%{?ocaml_native_compiler} -make opt -%endif +dune_release_pkgs='lablgl' +%ocaml_dune_setup +%ocaml_dune_build %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs -make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL \ - DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs \ - BINDIR=$RPM_BUILD_ROOT%{_bindir} \ - install - -# Make and install a META file. -cat <<EOM >META -version="%{version}" -directory="+lablgl" -archive(byte) = "lablgl.cma" -archive(native) = "lablgl.cmxa" - -package "togl" ( - requires = "labltk lablgl" - archive(byte) = "togl.cma" - archive(native) = "togl.cmxa" -) - -package "glut" ( - requires = "lablgl" - archive(byte) = "lablglut.cma" - archive(native) = "lablglut.cmxa" -) -EOM -cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL - -# Remove unnecessary *.ml files (ones which have a *.mli). -pushd $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL -for f in *.ml; do \ - b=`basename $f .ml`; \ - if [ -f "$b.mli" ]; then \ - rm $f; \ - fi; \ -done -popd -# -mkdir -vp %{buildroot}/etc/ld.so.conf.d/ -tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/stublibs -_EOF_ -# +%ocaml_dune_install %ocaml_create_file_list -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%check +%ocaml_dune_test %files -f %{name}.files -%doc README -/etc/ld.so.conf.d/*.conf -%{_bindir}/lablgl -%{_bindir}/lablglut %files devel -f %{name}.files.devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.TGVGN7/_old 2019-11-12 16:12:18.395809565 +0100 +++ /var/tmp/diff_new_pack.TGVGN7/_new 2019-11-12 16:12:18.395809565 +0100 @@ -1,11 +1,210 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/garrigue/lablgl.git</param> + <param name="url">https://github.com/olafhering/ocaml-lablgl.git</param> <param name="scm">git</param> <param name="versionformat">1.06</param> - <!-- v1.06 --> - <param name="revision">d0fd3cb1d1ca345e47ea198aead3dce727650ae4</param> + <param name="revision">dune-v1.06</param> <param name="filename">ocaml-lablgl</param> +<param name="exclude">.cvsignore</param> +<param name="exclude">CHANGES</param> +<param name="exclude">LablGlut/ChangeLog</param> +<param name="exclude">LablGlut/README</param> +<param name="exclude">LablGlut/THANKS</param> +<param name="exclude">LablGlut/TODO</param> +<param name="exclude">LablGlut/examples</param> +<param name="exclude">LablGlut/examples/README</param> +<param name="exclude">LablGlut/examples/caml-images</param> +<param name="exclude">LablGlut/examples/caml-images/ChangeLog</param> +<param name="exclude">LablGlut/examples/caml-images/Makefile</param> +<param name="exclude">LablGlut/examples/caml-images/OCamlMakefile</param> +<param name="exclude">LablGlut/examples/caml-images/main.ml</param> +<param name="exclude">LablGlut/examples/caml-images/ppm.ppm</param> +<param name="exclude">LablGlut/examples/etc</param> +<param name="exclude">LablGlut/examples/etc/draw2d.ml</param> +<param name="exclude">LablGlut/examples/etc/in-progress</param> +<param name="exclude">LablGlut/examples/etc/in-progress/scene_graph.ml</param> +<param name="exclude">LablGlut/examples/glut3.7</param> +<param name="exclude">LablGlut/examples/glut3.7/demos</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/README</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust00.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust01.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust02.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust03.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust04.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust05.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust06.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust07.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust08.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust09.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust10.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust11.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust12.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust13.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust14.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust15.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust16.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust17.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust18.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust19.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust20.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust21.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust22.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust23.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust24.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust25.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust26.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust27.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust28.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust29.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust30.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/caust31.bw</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/dino.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/dino.mli</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/floor.rgb</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/texload.c</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/texload.h</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/texload.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/demos/underwater/underwater.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/dinospin.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/dinospin.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/scube.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/scube.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/splatlogo.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/splatlogo.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/spots.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/spots.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/stars.c</param> +<param name="exclude">LablGlut/examples/glut3.7/not_yet_ported/stars.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test</param> +<param name="exclude">LablGlut/examples/glut3.7/test/TAGS</param> +<param name="exclude">LablGlut/examples/glut3.7/test/cursor_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/joy_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/keyup_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/menu_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/TAGS</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/bigtest.c</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/bigtest.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/over_test.c</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/over_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/not_yet_ported/test6.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/shape_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test1.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test10.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test11.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test12.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test13.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test14.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test15.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test16.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test17.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test18.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test19.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test2.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test20.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test21.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test22.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test23.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test24.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test25.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test26.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test27.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test28.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test3.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test4.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test7.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test8.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/test9.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/test/timer_test.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/trackball</param> +<param name="exclude">LablGlut/examples/glut3.7/trackball/Makefile</param> +<param name="exclude">LablGlut/examples/glut3.7/trackball/teaspin.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/trackball/trackball.ml</param> +<param name="exclude">LablGlut/examples/glut3.7/trackball/trackball.mli</param> +<param name="exclude">LablGlut/examples/lablGL</param> +<param name="exclude">LablGlut/examples/lablGL/README</param> +<param name="exclude">LablGlut/examples/lablGL/checker.ml</param> +<param name="exclude">LablGlut/examples/lablGL/gears.ml</param> +<param name="exclude">LablGlut/examples/lablGL/morph3d.ml</param> +<param name="exclude">LablGlut/examples/lablGL/planet.ml</param> +<param name="exclude">LablGlut/examples/lablGL/scene.ml</param> +<param name="exclude">LablGlut/examples/lablGL/simple.ml</param> +<param name="exclude">LablGlut/examples/lablGL/test_glsl.ml</param> +<param name="exclude">LablGlut/examples/lablGL/texturesurf.ml</param> +<param name="exclude">LablGlut/examples/nehe</param> +<param name="exclude">LablGlut/examples/nehe/lesson2.ml</param> +<param name="exclude">LablGlut/examples/nehe/lesson3.ml</param> +<param name="exclude">LablGlut/examples/nehe/lesson4.ml</param> +<param name="exclude">LablGlut/examples/nehe/lesson5.ml</param> +<param name="exclude">LablGlut/lgcompile</param> +<param name="exclude">LablGlut/src/.cvsignore</param> +<param name="exclude">LablGlut/src/.depend</param> +<param name="exclude">LablGlut/src/Makefile</param> +<param name="exclude">LablGlut/src/lablglut.bat</param> +<param name="exclude">META</param> +<param name="exclude">Makefile</param> +<param name="exclude">Makefile.common</param> +<param name="exclude">Makefile.config.ex</param> +<param name="exclude">Makefile.config.freebsd</param> +<param name="exclude">Makefile.config.linux.mdk</param> +<param name="exclude">Makefile.config.mingw</param> +<param name="exclude">Makefile.config.msvc</param> +<param name="exclude">Makefile.config.osx</param> +<param name="exclude">Makefile.config.ubuntu</param> +<param name="exclude">README</param> +<param name="exclude">Togl/examples</param> +<param name="exclude">Togl/examples/Makefile</param> +<param name="exclude">Togl/examples/README</param> +<param name="exclude">Togl/examples/checker.ml</param> +<param name="exclude">Togl/examples/double.ml</param> +<param name="exclude">Togl/examples/gears.ml</param> +<param name="exclude">Togl/examples/gears_a.ml</param> +<param name="exclude">Togl/examples/morph3d.ml</param> +<param name="exclude">Togl/examples/planet.ml</param> +<param name="exclude">Togl/examples/scene.ml</param> +<param name="exclude">Togl/examples/simple.ml</param> +<param name="exclude">Togl/examples/tennis.ml</param> +<param name="exclude">Togl/examples/tesselate.ml</param> +<param name="exclude">Togl/examples/texturesurf.ml</param> +<param name="exclude">Togl/src</param> +<param name="exclude">Togl/src/.cvsignore</param> +<param name="exclude">Togl/src/.depend</param> +<param name="exclude">Togl/src/Makefile</param> +<param name="exclude">Togl/src/Togl</param> +<param name="exclude">Togl/src/Togl/LICENSE</param> +<param name="exclude">Togl/src/Togl/Togl.html</param> +<param name="exclude">Togl/src/Togl/ben.rgb</param> +<param name="exclude">Togl/src/Togl/double.c</param> +<param name="exclude">Togl/src/Togl/double.tcl</param> +<param name="exclude">Togl/src/Togl/gears.c</param> +<param name="exclude">Togl/src/Togl/gears.tcl</param> +<param name="exclude">Togl/src/Togl/image.c</param> +<param name="exclude">Togl/src/Togl/image.h</param> +<param name="exclude">Togl/src/Togl/index.c</param> +<param name="exclude">Togl/src/Togl/index.tcl</param> +<param name="exclude">Togl/src/Togl/overlay.c</param> +<param name="exclude">Togl/src/Togl/overlay.tcl</param> +<param name="exclude">Togl/src/Togl/stereo.c</param> +<param name="exclude">Togl/src/Togl/stereo.tcl</param> +<param name="exclude">Togl/src/Togl/texture.c</param> +<param name="exclude">Togl/src/Togl/texture.tcl</param> +<param name="exclude">Togl/src/Togl/tkFont.h</param> +<param name="exclude">Togl/src/Togl/togl.c</param> +<param name="exclude">Togl/src/Togl/togl.h</param> +<param name="exclude">Togl/src/Togl/tree2.rgba</param> +<param name="exclude">Togl/src/lablgl.bat</param> +<param name="exclude">Togl/src/ml_togl.c</param> +<param name="exclude">Togl/src/togl.ml</param> +<param name="exclude">Togl/src/togl.mli</param> +<param name="exclude">Togl/src/togl_tags.var</param> +<param name="exclude">src/.cvsignore</param> +<param name="exclude">src/.depend</param> +<param name="exclude">src/Makefile</param> +<param name="exclude">src/build.ml.in</param> +<param name="exclude">src/var2def.ml</param> +<param name="exclude">src/var2switch.ml</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ ocaml-lablgl-1.06.tar.xz ++++++ ++++ 32830 lines of diff (skipped)
