Accepting request 512517 from devel:languages:ocaml

- Use Group: Development/Languages/OCaml

- Wrap specfile conditionals to fix quilt setup

- Remove autodeps for pre openSUSE 12.1 releases

OBS-URL: https://build.opensuse.org/request/show/512517
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-calendar?expand=0&rev=2

ocaml-calendar.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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
+
+- Wrap specfile conditionals to fix quilt setup
+
+-------------------------------------------------------------------
+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
 

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
@@ -24,33 +24,27 @@
 Name:           ocaml-calendar
 Version:        2.04
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?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
 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.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 
 %description    devel
@@ -62,7 +56,6 @@ developing applications that use %{name}.
 %patch1 -p1
 %patch2 -p1
 
-
 %build
 ./configure --libdir=%{_libdir}
 make %{?_smp_mflags}
@@ -71,20 +64,18 @@ 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
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
@@ -93,7 +84,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 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa
@@ -106,4 +97,3 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %{_libdir}/ocaml/*/META
 
 %changelog
-