From a6084ea37f87ea1af24ab672921a6af39c6f8c5efa9e3da729068c171514561a Mon Sep 17 00:00:00 2001 From: Berthold Gunreben Date: Tue, 14 Dec 2010 10:25:49 +0000 Subject: [PATCH] Accepting request 55838 from KDE:Distro:Factory Accepted submit request 55838 from user wstephenson OBS-URL: https://build.opensuse.org/request/show/55838 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=21 --- fixbuild_with_libcfitsio.diff | 12 ++++++++++++ kst-2.0.0.tar.bz2 | 3 --- kst-2.0.2.tar.bz2 | 3 +++ kst.changes | 8 ++++++++ kst.spec | 13 ++++++++----- 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 fixbuild_with_libcfitsio.diff delete mode 100644 kst-2.0.0.tar.bz2 create mode 100644 kst-2.0.2.tar.bz2 diff --git a/fixbuild_with_libcfitsio.diff b/fixbuild_with_libcfitsio.diff new file mode 100644 index 0000000..8de23fe --- /dev/null +++ b/fixbuild_with_libcfitsio.diff @@ -0,0 +1,12 @@ +--- src/datasources/fitsimage/fitsimage.h 2010-10-03 02:40:28.000000000 +0200 ++++ src/datasources/fitsimage/fitsimage.h_new 2010-11-22 21:39:48.000000000 +0100 +@@ -17,8 +17,7 @@ + #include + #include + +-//#include +-#include ++#include + + class DataInterfaceFitsImageMatrix; + diff --git a/kst-2.0.0.tar.bz2 b/kst-2.0.0.tar.bz2 deleted file mode 100644 index 8d9f5cf..0000000 --- a/kst-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e13658e6f41551b0ef71d9e4d81444447af76d9017e385ad7e9a3f8bfc0c7315 -size 10091947 diff --git a/kst-2.0.2.tar.bz2 b/kst-2.0.2.tar.bz2 new file mode 100644 index 0000000..6d5cf80 --- /dev/null +++ b/kst-2.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f49017c4e04cb0d57092e3171f448e853f60a48f4a2ad79515c973f53b2719a +size 10316390 diff --git a/kst.changes b/kst.changes index 9a20bee..d162c24 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 22 18:07:54 UTC 2010 - ctrippe@gmx.net + +- Update to kst 2.0.2 + * Kst 2.0.2: Kst does not crash any more when ASCII data is imported. + * Kst 2.0.1: Many bugfixes and polished GUI (e.g. drag and drop of plots between tabs) +- BuildRequire libnetcdf-devel + ------------------------------------------------------------------- Tue Aug 31 17:55:22 UTC 2010 - ctrippe@gmx.net diff --git a/kst.spec b/kst.spec index fc4901a..f7a74a2 100644 --- a/kst.spec +++ b/kst.spec @@ -22,15 +22,17 @@ Name: kst BuildRequires: gsl-devel kdebase4-workspace-devel libkde4-devel readline-devel BuildRequires: libcfitsio-devel libqt4-devel update-desktop-files BuildRequires: fdupes +BuildRequires: libnetcdf-devel License: GPLv2+ Group: Productivity/Graphics/Visualization/Graph Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -Version: 2.0.0 +Version: 2.0.2 Release: 1 Url: http://extragear.kde.org/apps/kst/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-2.0.0.tar.bz2 +Source0: %name-%{version}.tar.bz2 Patch: fix-desktop.diff +Patch1: fixbuild_with_libcfitsio.diff %description Kst is a data plotting and viewing program. Some of the features @@ -102,11 +104,11 @@ Authors: Rick Chern %prep -%setup -q -n %name-2.0.0 +%setup -q -n %name-%{version} %patch +%patch1 %build -export INSTDIR=/usr %ifarch x86_64 export INSTALL_LIBDIR=lib64 %endif @@ -129,7 +131,8 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %dir %{_libdir}/kst -%{_bindir}/kst2 +%{_bindir}/kst2 +%{_bindir}/dirfile_maker_new %{_libdir}/libkst2app.so.* %{_libdir}/libkst2math.so.* %{_libdir}/libkst2lib.so.*