Hello community, here is the log from the commit of package ocaml-gettext for openSUSE:Factory checked in at 2019-11-13 13:15:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-gettext (Old) and /work/SRC/openSUSE:Factory/.ocaml-gettext.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-gettext" Wed Nov 13 13:15:00 2019 rev:4 rq:746701 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-gettext/ocaml-gettext.changes 2017-08-18 15:01:48.220119781 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-gettext.new.2990/ocaml-gettext.changes 2019-11-13 13:15:04.810870194 +0100 @@ -1,0 +2,12 @@ +Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de + +- Require current dune macros +- Update to version 0.4.1, via _service file + Improve documentation layout. + Migrate build system to dune. + Move ocaml-xgettext from Camlp4 to ppx. +- Remove sub packages +- Remove ocaml-gettext-unix.patch +- Remove ocaml-gettext-0.3.5-use-ocamlopt-g.patch + +------------------------------------------------------------------- Old: ---- ocaml-gettext-0.3.5-use-ocamlopt-g.patch ocaml-gettext-0.3.5.tar.gz ocaml-gettext-unix.patch New: ---- _service ocaml-gettext-0.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-gettext.spec ++++++ --- /var/tmp/diff_new_pack.uu8DOO/_old 2019-11-13 13:15:06.010871443 +0100 +++ /var/tmp/diff_new_pack.uu8DOO/_new 2019-11-13 13:15:06.010871443 +0100 @@ -12,40 +12,39 @@ # 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/ # -%global __ocaml_requires_opts -i Asttypes -i Parsetree -%global __ocaml_provides_opts -i Pr_gettext - Name: ocaml-gettext -Version: 0.3.5 +Version: 0.4.1 Release: 0 %{?ocaml_preserve_bytecode} Summary: OCaml library for i18n License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/OCaml Url: https://github.com/gildor478/ocaml-gettext -Source0: http://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-%{version}.tar.gz -Patch0: ocaml-gettext-unix.patch -Patch1: ocaml-gettext-0.3.5-use-ocamlopt-g.patch -BuildRequires: autoconf -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxml2 -BuildRequires: libxslt -BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-camomile-data -BuildRequires: ocaml-camomile-devel >= 0.8.1 -BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-ounit-devel -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 >= 20191101 +BuildRequires: ocamlfind(camomile) +BuildRequires: ocamlfind(compiler-libs.common) +BuildRequires: ocamlfind(dune.configurator) +BuildRequires: ocamlfind(fileutils) +BuildRequires: ocamlfind(oUnit) +BuildRequires: ocamlfind(str) # ocaml-gettext program needs camomile data files Requires: ocaml-camomile-data +# +Obsoletes: ocaml-gettext-camomile < %{version}-%{release} +Obsoletes: ocaml-gettext-stub < %{version}-%{release} +Obsoletes: ocaml-gettext-stub-devel < %{version}-%{release} +Obsoletes: ocaml-gettext-stub-debuginfo < %{version}-%{release} +Provides: ocaml-gettext-camomile = %{version}-%{release} +Provides: ocaml-gettext-stub = %{version}-%{release} +Provides: ocaml-gettext-stub-devel = %{version}-%{release} +Provides: ocaml-gettext-stub-debuginfo = %{version}-%{release} %description Ocaml-gettext provides support for internationalization of Ocaml @@ -62,167 +61,34 @@ Summary: Development files for %{name} Group: Development/Languages/OCaml Requires: %{name} = %{version} +Obsoletes: ocaml-gettext-camomile-devel < %{version}-%{release} +Provides: ocaml-gettext-camomile-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. -%package stub -Summary: Parts of %{name} which depend on Camomile -Group: Development/Languages/OCaml -Requires: %{name} = %{version} - -%description stub -The %{name}-stub package contains the parts of %{name} which -depend on Camomile. - -%package stub-devel -Summary: Development files for %{name}-stub -Group: Development/Languages/OCaml -Requires: %{name}-stub = %{version} - -%description stub-devel -The %{name}-stub-devel package contains libraries and -signature files for developing applications that use -%{name}-stub. - -%package camomile -Summary: Parts of %{name} which depend on Camomile -Group: Development/Languages/OCaml -Requires: %{name} = %{version} - -%description camomile -The %{name}-camomile package contains the parts of %{name} which -depend on Camomile. - -%package camomile-devel -Summary: Development files for %{name}-camomile -Group: Development/Languages/OCaml -Requires: %{name}-camomile-devel = %{version} - -%description camomile-devel -The %{name}-camomile-devel package contains libraries and -signature files for developing applications that use -%{name}-camomile. - %prep -%setup -q -%patch0 -p1 -%patch1 -p1 - -%define _stylesheet_path "%{_datadir}/xml/docbook/stylesheet/nwalsh/current" +%autosetup -p1 %build -# Parallel builds don't work. -unset MAKEFLAGS -CFLAGS="%{optflags}" \ -./configure \ - --libdir=%{_libdir} \ - --enable-test \ - --with-docbook-stylesheet=%{_stylesheet_path} -make all - -%check -export LD_LIBRARY_PATH=$PWD/_build/lib/gettext-stub -pushd test -../_build/bin/test -popd +dune_release_pkgs='gettext,gettext-camomile,gettext-stub' +%ocaml_dune_setup +%ocaml_dune_build %install -# make install in the package is screwed up completely. Install -# by hand instead. -export DESTDIR=%{buildroot} -export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs -mkdir -p %{buildroot}%{_bindir} - -# Remove *.o files - these shouldn't be distributed. -find _build -name '*.o' -exec rm {} \; - -ocamlfind install gettext _build/lib/gettext/* -ocamlfind install gettext-stub _build/lib/gettext-stub/* -ocamlfind install gettext-camomile _build/lib/gettext-camomile/* -install -m 0755 _build/bin/ocaml-gettext %{buildroot}%{_bindir}/ -install -m 0755 _build/bin/ocaml-xgettext %{buildroot}%{_bindir}/ -# -mkdir -vp %{buildroot}/etc/ld.so.conf.d/ -tee %{buildroot}/etc/ld.so.conf.d/%{name}-stub.conf <<_EOF_ -%{_libdir}/ocaml/stublibs -_EOF_ -# +%ocaml_dune_install +%ocaml_create_file_list +grep -m1 '%%dir' %{name}.files.devel | tee %{name}.files.stub-devel -%post -n %{name}-stub -p /sbin/ldconfig +%check +dune_test_tolerate_fail='dune_test_tolerate_fail' +%ocaml_dune_test -%postun -n %{name}-stub -p /sbin/ldconfig +%files -f %{name}.files +%{_bindir}/* +%{_mandir}/*/* -%files -%defattr(-,root,root,-) -%doc COPYING -%{_bindir}/ocaml-gettext -%{_bindir}/ocaml-xgettext -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext - -%files devel -%defattr(-,root,root,-) -%doc README CHANGELOG TODO -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/gettext/*.a -%{_libdir}/ocaml/gettext/*.cmx -%{_libdir}/ocaml/gettext/*.cmxa -%endif -%{_libdir}/ocaml/gettext/*.cma -%{_libdir}/ocaml/gettext/*.cmi -%{_libdir}/ocaml/gettext/*.cmo -%{_libdir}/ocaml/gettext/*.ml -%{_libdir}/ocaml/gettext/*.mli -%{_libdir}/ocaml/gettext/META - -%files stub -%defattr(-,root,root,-) -%doc COPYING -/etc/ld.so.conf.d/*.conf -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext-stub -%{_libdir}/ocaml/stublibs/*.so -%{_libdir}/ocaml/stublibs/*.so.owner - -%files stub-devel -%defattr(-,root,root,-) -%doc README -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext-stub -%{_libdir}/ocaml/gettext-stub/*.a -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/gettext-stub/*.cmx -%{_libdir}/ocaml/gettext-stub/*.cmxa -%endif -%{_libdir}/ocaml/gettext-stub/*.cma -%{_libdir}/ocaml/gettext-stub/*.cmi -%{_libdir}/ocaml/gettext-stub/*.ml -%{_libdir}/ocaml/gettext-stub/META - -%files camomile -%defattr(-,root,root,-) -%doc COPYING -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext-camomile - -%files camomile-devel -%defattr(-,root,root,-) -%doc README -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/gettext-camomile -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/gettext-camomile/*.a -%{_libdir}/ocaml/gettext-camomile/*.cmx -%{_libdir}/ocaml/gettext-camomile/*.cmxa -%endif -%{_libdir}/ocaml/gettext-camomile/*.cma -%{_libdir}/ocaml/gettext-camomile/*.cmi -%{_libdir}/ocaml/gettext-camomile/*.mli -%{_libdir}/ocaml/gettext-camomile/META +%files devel -f %{name}.files.devel %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/gildor478/ocaml-gettext.git</param> <param name="scm">git</param> <param name="versionformat">0.4.1</param> <!-- v0.4.1 --> <param name="revision">a74be839b4e1305a538e2838f5700b5a7907a197</param> <param name="filename">ocaml-gettext</param> <param name="exclude">patches</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
