From bcad82ca62e2c114ff8f1f3910700d847e73f68f78bae410b50eb935758f8502 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 26 Mar 2012 09:02:42 +0000 Subject: [PATCH] Accepting request 110897 from KDE:Distro:Factory - Depend on netcdf-devel for openSUSE >= 12.2 - Build in parallel OBS-URL: https://build.opensuse.org/request/show/110897 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=32 --- kst.changes | 6 ++++++ kst.spec | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/kst.changes b/kst.changes index f4f584b..69d13f9 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 24 15:07:35 UTC 2012 - idonmez@suse.com + +- Depend on netcdf-devel for openSUSE >= 12.2 +- Build in parallel + ------------------------------------------------------------------- Mon Oct 17 13:11:58 UTC 2011 - toddrme2178@gmail.com diff --git a/kst.spec b/kst.spec index ec98c59..beefc6f 100644 --- a/kst.spec +++ b/kst.spec @@ -1,7 +1,7 @@ # # spec file for package kst # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Christian Trippe ctrippe@opensuse.org # # All modifications and additions to the file contributed by third parties @@ -16,13 +16,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kst Version: 2.0.4 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -Url: http://kst-plot.kde.org/ +License: GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph +Url: http://kst-plot.kde.org/ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel @@ -31,7 +32,11 @@ BuildRequires: fdupes BuildRequires: gsl-devel BuildRequires: kde4-filesystem BuildRequires: libcfitsio-devel +%if 0%{?suse_version} >= 1220 +BuildRequires: netcdf-devel +%else BuildRequires: libnetcdf-devel +%endif BuildRequires: libqt4-devel BuildRequires: readline-devel BuildRequires: update-desktop-files @@ -83,6 +88,7 @@ EXTRA_FLAGS="-Dkst_install_prefix=%{_kde_prefix} \ -Dkst_install_plugin_desktop_file_path=%{_kde4_servicesdir}/%{name} -Dkst_release=1" %cmake_kde4 -d build -- $EXTRA_FLAGS $RPM_BUILD_DIR/%buildsubdir/cmake +make %{?_smp_mflags} %install cd build