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
This commit is contained in:
Ruediger Meier 2015-01-21 11:46:45 +00:00 committed by Git OBS Bridge
parent 417ae6ca10
commit d3e77d5418
2 changed files with 25 additions and 8 deletions

View File

@ -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 Tue Oct 7 15:08:30 UTC 2014 - sweet_f_a@gmx.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package dateutils # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,12 +19,24 @@
%define xversion 0.3.1 %define xversion 0.3.1
%define have_octave 0 %define have_octave 0
%ifarch i586 x86_64
%if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315
%define have_octave 1 %define have_octave 1
%endif %ifarch aarch64
%if 0%{?suse_version} <= 1230 && 0%{?mandriva_version} <= 201100 %if 0%{?suse_version} <= 1310
%define have_octave 0 %define have_octave 0
%endif %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 Name: dateutils
Version: 0.3.1 Version: 0.3.1
@ -32,7 +44,7 @@ Release: 0
Summary: Nifty command line date and time utilities Summary: Nifty command line date and time utilities
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Text/Utilities 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 Source: https://bitbucket.org/hroptatyr/dateutils/downloads/%{name}-%{version}.tar.xz
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xz BuildRequires: xz
@ -70,11 +82,11 @@ Dateutils can be used from within matlab or ocatave.
%build %build
%configure \ %configure \
--docdir=%{_docdir}/%{name} \ --docdir=%{_docdir}/%{name} \
%if %have_octave %if %have_octave
--enable-contrib \ --enable-contrib \
%endif %endif
ignorethisline=xxx ignorethisline=xxx
make V=1 make V=1
%install %install