Hello community,

here is the log from the commit of package ocaml-camlp4 for openSUSE:Factory 
checked in at 2020-02-26 15:01:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-camlp4 (Old)
 and      /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ocaml-camlp4"

Wed Feb 26 15:01:26 2020 rev:7 rq:778050 version:4.05

Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-camlp4/ocaml-camlp4.changes        
2019-11-30 10:36:33.188178158 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-camlp4.new.26092/ocaml-camlp4.changes     
2020-02-26 15:01:30.288767204 +0100
@@ -1,0 +2,10 @@
+Thu Feb 20 20:20:20 UTC 2020 - [email protected]
+
+- Fix inconsistent packaging
+  Move everything into the devel subpkg The binaries are already
+  in the devel subpkg, but they need libs from the main pkg. With
+  the update Requires/Provides both pkgs provide identical strings,
+  which leads to conflicts
+- Require current ocaml-rpm-macros
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml-camlp4.spec ++++++
--- /var/tmp/diff_new_pack.4IJyAY/_old  2020-02-26 15:01:31.468769558 +0100
+++ /var/tmp/diff_new_pack.4IJyAY/_new  2020-02-26 15:01:31.468769558 +0100
@@ -26,11 +26,11 @@
 Url:            https://github.com/ocaml/camlp4
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  ocaml-ocamlbuild
-BuildRequires:  ocaml-rpm-macros >= 20191101
+BuildRequires:  ocaml-rpm-macros >= 20200220
 BuildRequires:  ocaml(ocaml_base_version) = 4.05
 BuildRequires:  ocamlfind(compiler-libs)
 Conflicts:      ocaml < 4.05.0
-Requires:       ocaml-runtime = 4.05.0
+Requires:       ocaml(ocaml_base_version) = 4.05
 
 %description
 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -68,7 +68,7 @@
 
 %install
 %make_install
-d="%{buildroot}$(ocamlc -where)/camlp4"
+d="%{buildroot}%{ocaml_standard_library}/camlp4"
 tee "${d}/META" <<_META_
 # Specifications for the "camlp4" preprocessor:
 requires = ""
@@ -215,44 +215,12 @@
   archive(native) = "camlp4prof.cmx"
 )
 _META_
+%ocaml_create_file_list
 
-%files
-%doc LICENSE README.md
-%dir %{_libdir}/ocaml/camlp4
-%dir %{_libdir}/ocaml/camlp4/Camlp4Filters
-%dir %{_libdir}/ocaml/camlp4/Camlp4Parsers
-%dir %{_libdir}/ocaml/camlp4/Camlp4Printers
-%dir %{_libdir}/ocaml/camlp4/Camlp4Top
-%{_libdir}/ocaml/camlp4/*.cma
-%{_libdir}/ocaml/camlp4/*.cmi
-%{_libdir}/ocaml/camlp4/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmo
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmi
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmo
-
-%files devel
-%{_bindir}/camlp4*
-%{_bindir}/mkcamlp4
-%dir %{_libdir}/ocaml/camlp4
-%{_libdir}/ocaml/camlp4/META
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/camlp4/*.a
-%{_libdir}/ocaml/camlp4/*.cmx
-%{_libdir}/ocaml/camlp4/*.cmxa
-%{_libdir}/ocaml/camlp4/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Filters/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Printers/*.o
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx
-%{_libdir}/ocaml/camlp4/Camlp4Top/*.o
-%endif
+%files -f %{name}.files
+%doc README.md
+
+%files devel -f %{name}.files.devel
+%{_bindir}/*
 
 %changelog


Reply via email to