Hello community,
here is the log from the commit of package ocaml-odn for openSUSE:Factory
checked in at 2017-08-18 15:02:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-odn (Old)
and /work/SRC/openSUSE:Factory/.ocaml-odn.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-odn"
Fri Aug 18 15:02:05 2017 rev:2 rq:512536 version:0.0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-odn/ocaml-odn.changes 2016-07-15
12:47:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-odn.new/ocaml-odn.changes 2017-08-18
15:02:07.281436503 +0200
@@ -1,0 +2,20 @@
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+Thu Jul 20 15:10:34 UTC 2017 - oher...@suse.de
+
+- Build with oasis
+
+-------------------------------------------------------------------
+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-odn.spec ++++++
--- /var/tmp/diff_new_pack.HfWVUZ/_old 2017-08-18 15:02:08.285295189 +0200
+++ /var/tmp/diff_new_pack.HfWVUZ/_new 2017-08-18 15:02:08.289294626 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-odn
#
-# 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,23 +19,18 @@
Name: ocaml-odn
Version: 0.0.11
Release: 0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
Summary: Store data using OCaml notation
License: LGPL-2.1+
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
-Url: http://forge.ocamlcore.org/projects/odn/
+Url: https://github.com/gildor478/ocaml-data-notation
Source0: ocaml-data-notation-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-odn
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
-%if 0%{?suse_version} < 1210
-Requires: ocaml-camlp4 ocaml-compiler-libs ocaml-runtime ocaml-type-conv
-%endif
-# ocaml autodep end for pkg: ocaml-odn
Provides: ocaml-data-notation
BuildRequires: ocaml
-BuildRequires: ocaml-ocamlbuild
+BuildRequires: ocaml-oasis
+BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03
BuildRequires: ocamlfind(camlp4.lib)
BuildRequires: ocamlfind(camlp4.quotations.o)
@@ -49,7 +44,7 @@
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
Provides: ocaml-data-notation-devel
@@ -60,6 +55,55 @@
%setup -n ocaml-data-notation-%{version}
%build
+# obs service changes every ^Version line ...
+sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
+OASISFormat: 0.4
+Name: %{name}
+Version: 0
+Synopsis: Store data using OCaml notation
+Authors: Sylvain Le Gall
+License: %{license}
+Plugins: META(`oasis version`)
+BuildTools: ocamlbuild
+
+Library odn
+ Path: src
+ Modules: ODN
+
+Library pa_odn
+ Path: src
+ Modules: Pa_odn
+ FindlibParent: odn
+ FindlibContainers: with
+ FindlibName: syntax
+ BuildDepends: type_conv (>= 108.07.01), camlp4.lib, camlp4.quotations.o
+ CompiledObject: byte
+ XMETAType: syntax
+ XMETARequires: type_conv, camlp4, odn
+ XMETADescription: Syntax extension for odn
+
+Library pa_noodn
+ Path: src
+ Modules: Pa_noodn
+ FindlibParent: odn
+ FindlibContainers: without
+ FindlibName: syntax
+ BuildDepends: type_conv, camlp4.lib, camlp4.quotations.o
+ CompiledObject: byte
+ XMETAType: syntax
+ XMETARequires: type_conv, camlp4
+ XMETADescription: Syntax extension that removes 'with odn'
+
+Document "odn"
+ Title: API reference for odn
+ Type: ocamlbuild
+ BuildTools+: ocamldoc
+ InstallDir: \$htmldir
+ Install: true
+ XOCamlbuildPath: .
+ XOCamlbuildLibraries: odn
+_EOF_
+%oasis_setup
%ocaml_oasis_configure --enable-docs
%ocaml_oasis_build
%ocaml_oasis_doc
@@ -72,21 +116,24 @@
%doc COPYING.txt
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs
%endif
%files devel
%defattr(-,root,root,-)
+%{oasis_docdir_html}
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
%endif
+%{_libdir}/ocaml/*/*.annot
%{_libdir}/ocaml/*/*.cma
%{_libdir}/ocaml/*/*.cmi
+%{_libdir}/ocaml/*/*.cmt
%{_libdir}/ocaml/*/*.ml
%{_libdir}/ocaml/*/META
