From 87daaebceee435b58cd35af354112de0155040cde74e72792d4ec7e9162c0680 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 11:01:37 +0000 Subject: [PATCH 1/6] Remove autodeps for pre openSUSE 12.1 releases OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=32 --- ocaml-cppo.changes | 5 +++++ ocaml-cppo.spec | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index 4d37e24..50fec18 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de + +- Remove autodeps for pre openSUSE 12.1 releases + ------------------------------------------------------------------- Wed May 31 07:07:33 UTC 2017 - olaf@aepfle.de diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 074fdd9..1f47b89 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -35,13 +35,6 @@ BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) BuildRoot: %{_tmppath}/%{name}-%{version}-build -# ocaml autodep start for pkg: ocaml-cppo -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-ocamlbuild -Requires: ocaml-runtime -%endif -# ocaml autodep end for pkg: ocaml-cppo %description Cppo is an equivalent of the C preprocessor targeted at the OCaml language and From 3e9ad5976f9723dfc619da28ce846c81b561af827a3cead66d1266184dc14a7d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 12:40:30 +0000 Subject: [PATCH 2/6] Wrap specfile conditionals to fix quilt setup OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=33 --- ocaml-cppo.changes | 5 +++++ ocaml-cppo.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index 50fec18..095fac5 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de + +- Wrap specfile conditionals to fix quilt setup + ------------------------------------------------------------------- Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 1f47b89..e827375 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -20,7 +20,9 @@ Name: ocaml-cppo Version: 1.5.0 Release: 0 +%if %{defined ocaml_preserve_bytecode} %{ocaml_preserve_bytecode} +%endif Summary: The C preprocessor written in OCaml License: BSD-3-Clause Group: Development/Libraries/Other @@ -118,7 +120,7 @@ _EOF_ %{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -127,7 +129,7 @@ _EOF_ %{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa From 855882294fe4899452bc0f77c4742cb6dffd303a77a25a8a40afcd4111bc9f01 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 14:56:55 +0000 Subject: [PATCH 3/6] fix incorrect ocaml_native_compiler macro change OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=34 --- ocaml-cppo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index e827375..6ef5132 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -120,7 +120,7 @@ _EOF_ %{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -129,7 +129,7 @@ _EOF_ %{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa From 1c0f2276403924e27b27efa498a89fda83ea94b808095ee226f0acdf4197047b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 18 Jul 2017 10:26:29 +0000 Subject: [PATCH 4/6] - Update Url OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=35 --- ocaml-cppo.changes | 5 +++++ ocaml-cppo.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index 095fac5..be6acad 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de + +- Update Url + ------------------------------------------------------------------- Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 6ef5132..f743566 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -26,7 +26,7 @@ Release: 0 Summary: The C preprocessor written in OCaml License: BSD-3-Clause Group: Development/Libraries/Other -Url: http://mjambon.com/cppo.html +Url: https://github.com/mjambon/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-oasis From 5e9daf1c61481b3d42e48e096a18409ab03eb2739b6326781a5dd975f7de2066 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 08:40:17 +0000 Subject: [PATCH 5/6] simpler variant of ocaml_preserve_bytecode usage (SR#511780) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=36 --- ocaml-cppo.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index f743566..e6dd82a 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -20,9 +20,7 @@ Name: ocaml-cppo Version: 1.5.0 Release: 0 -%if %{defined ocaml_preserve_bytecode} -%{ocaml_preserve_bytecode} -%endif +%{?ocaml_preserve_bytecode} Summary: The C preprocessor written in OCaml License: BSD-3-Clause Group: Development/Libraries/Other From 9da45b40c46615fc8fd92878337704443d2de4ca2430a84a662c899f63ca8a2e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 13:21:39 +0000 Subject: [PATCH 6/6] Use Group: Development/Languages/OCaml OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=37 --- ocaml-cppo.changes | 5 +++++ ocaml-cppo.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index be6acad..ef55068 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de + +- Use Group: Development/Languages/OCaml + ------------------------------------------------------------------- Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index e6dd82a..fe4ba9d 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -23,7 +23,7 @@ Release: 0 %{?ocaml_preserve_bytecode} Summary: The C preprocessor written in OCaml License: BSD-3-Clause -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Url: https://github.com/mjambon/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml @@ -51,7 +51,7 @@ robustness of cppo across OCaml versions. %package devel Summary: Development files for %{name} -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: %{name} = %{version} %description devel