From 19ddcdabe4388500846cda69ed5349c089c51642ee7a0b0f1668cc2988f3fe09 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 11:01:14 +0000 Subject: [PATCH 1/5] Remove autodeps for pre openSUSE 12.1 releases OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=12 --- ocaml-calendar.changes | 5 +++++ ocaml-calendar.spec | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ocaml-calendar.changes b/ocaml-calendar.changes index 8cb66dd..25fe70c 100644 --- a/ocaml-calendar.changes +++ b/ocaml-calendar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de + +- Remove autodeps for pre openSUSE 12.1 releases + ------------------------------------------------------------------- Mon May 30 06:39:17 UTC 2016 - ohering@suse.de diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 8a7bf55..1b56126 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-calendar # -# 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 @@ -34,16 +34,10 @@ Patch1: calendar-2.04-enable-debug.patch Patch2: ocaml-calendar-buildcompare.patch BuildRequires: gawk BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-rpm-macros >= 4.02.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-rpm-macros >= 4.02.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -# ocaml autodep start for pkg: ocaml-calendar -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-runtime -%endif -# ocaml autodep end for pkg: ocaml-calendar %description Objective Caml library for managing dates and times. @@ -62,7 +56,6 @@ developing applications that use %{name}. %patch1 -p1 %patch2 -p1 - %build ./configure --libdir=%{_libdir} make %{?_smp_mflags} @@ -71,14 +64,12 @@ make %{?_smp_mflags} doc mv TODO TODO.old iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO - %install export DESTDIR=%{buildroot} export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR make DESTDIR=%{buildroot} install %{?_smp_mflags} - %files %defattr(-,root,root,-) %doc CHANGES README TODO LGPL COPYING @@ -106,4 +97,3 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %{_libdir}/ocaml/*/META %changelog - From 7ca356ecc4c96b49bc77336a3aeff30a49955a408a16b1a94fbb98a790197b6b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 12:39:48 +0000 Subject: [PATCH 2/5] Wrap specfile conditionals to fix quilt setup OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=13 --- ocaml-calendar.changes | 5 +++++ ocaml-calendar.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ocaml-calendar.changes b/ocaml-calendar.changes index 25fe70c..0c2a7fa 100644 --- a/ocaml-calendar.changes +++ b/ocaml-calendar.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-calendar.spec b/ocaml-calendar.spec index 1b56126..5e0c3c5 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -24,7 +24,9 @@ Name: ocaml-calendar Version: 2.04 Release: 0 +%if %{defined ocaml_preserve_bytecode} %{ocaml_preserve_bytecode} +%endif Summary: Objective Caml library for managing dates and times License: LGPL-2.0 Group: Development/Libraries/Other @@ -75,7 +77,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %doc CHANGES README TODO LGPL COPYING %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -84,7 +86,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %doc CHANGES README TODO LGPL COPYING doc/* %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 e8967f78fa48546141a6419a3ea9ea40fc30ea1e9741ebcce151c42475557cca Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 14:56:17 +0000 Subject: [PATCH 3/5] fix incorrect ocaml_native_compiler macro change OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=14 --- ocaml-calendar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 5e0c3c5..4cb291e 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -77,7 +77,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %doc CHANGES README TODO LGPL COPYING %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -86,7 +86,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %doc CHANGES README TODO LGPL COPYING doc/* %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 b85255fc1ff1ec7e0945f4e664c98ba460bb90963a343acd003588838875a388 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 08:40:01 +0000 Subject: [PATCH 4/5] simpler variant of ocaml_preserve_bytecode usage (SR#511780) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=15 --- ocaml-calendar.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 4cb291e..9aa4d40 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -24,9 +24,7 @@ Name: ocaml-calendar Version: 2.04 Release: 0 -%if %{defined ocaml_preserve_bytecode} -%{ocaml_preserve_bytecode} -%endif +%{?ocaml_preserve_bytecode} Summary: Objective Caml library for managing dates and times License: LGPL-2.0 Group: Development/Libraries/Other From 08d422348364b50671e7c6391b8e502793bcec757526038bbfdc0c4492803bb8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 13:21:13 +0000 Subject: [PATCH 5/5] Use Group: Development/Languages/OCaml OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=16 --- ocaml-calendar.changes | 5 +++++ ocaml-calendar.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ocaml-calendar.changes b/ocaml-calendar.changes index 0c2a7fa..74c7cb7 100644 --- a/ocaml-calendar.changes +++ b/ocaml-calendar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de + +- Use Group: Development/Languages/OCaml + ------------------------------------------------------------------- Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 9aa4d40..42e46ad 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -27,7 +27,7 @@ Release: 0 %{?ocaml_preserve_bytecode} Summary: Objective Caml library for managing dates and times License: LGPL-2.0 -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Url: http://calendar.forge.ocamlcore.org/ Source0: http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz Patch1: calendar-2.04-enable-debug.patch @@ -44,7 +44,7 @@ Objective Caml library for managing dates and times. %package devel Summary: Development files for %{name} -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: %{name} = %{version} %description devel