From d3e77d5418189da6d24fd8a18029be17b0fe55d47ea09d4cfbbde0a597fe15d1 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Wed, 21 Jan 2015 11:46:45 +0000 Subject: [PATCH] Accepting request 281969 from home:rudi_m - sort out distros with and without octave OBS-URL: https://build.opensuse.org/request/show/281969 OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=32 --- dateutils.changes | 5 +++++ dateutils.spec | 28 ++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dateutils.changes b/dateutils.changes index 00ca98d..6d9bb56 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 16 11:26:54 UTC 2015 - sweet_f_a@gmx.de + +- sort out distros with and without octave + ------------------------------------------------------------------- Tue Oct 7 15:08:30 UTC 2014 - sweet_f_a@gmx.de diff --git a/dateutils.spec b/dateutils.spec index fef6269..a83e328 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -1,7 +1,7 @@ # # spec file for package dateutils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,12 +19,24 @@ %define xversion 0.3.1 %define have_octave 0 -%ifarch i586 x86_64 + +%if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315 %define have_octave 1 -%endif -%if 0%{?suse_version} <= 1230 && 0%{?mandriva_version} <= 201100 +%ifarch aarch64 +%if 0%{?suse_version} <= 1310 %define have_octave 0 %endif +%endif +%ifnarch i586 x86_64 +%if 0%{?suse_version} < 1310 +%define have_octave 0 +%endif +%endif +%endif + +%if 0%{?fedora_version} >= 19 +%define have_octave 1 +%endif Name: dateutils Version: 0.3.1 @@ -32,7 +44,7 @@ Release: 0 Summary: Nifty command line date and time utilities License: BSD-3-Clause Group: Productivity/Text/Utilities -URL: https://github.com/hroptatyr/dateutils/ +Url: https://github.com/hroptatyr/dateutils/ Source: https://bitbucket.org/hroptatyr/dateutils/downloads/%{name}-%{version}.tar.xz BuildRequires: pkgconfig BuildRequires: xz @@ -70,11 +82,11 @@ Dateutils can be used from within matlab or ocatave. %build %configure \ - --docdir=%{_docdir}/%{name} \ + --docdir=%{_docdir}/%{name} \ %if %have_octave - --enable-contrib \ + --enable-contrib \ %endif - ignorethisline=xxx + ignorethisline=xxx make V=1 %install