From 1caf6aa401ea6ac5d4a59629148186b6d4431457f7c1e7b077a7c422a5e430ee Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 21 Apr 2011 10:19:11 +0000 Subject: [PATCH] Accepting request 68004 from KDE:Distro:Factory Accepted submit request 68004 from user coolo OBS-URL: https://build.opensuse.org/request/show/68004 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=26 --- fix-desktop.diff | 13 ------ fixbuild_with_libcfitsio.diff | 12 ----- kst-2.0.2.tar.bz2 | 3 -- kst-2.0.3.tar.bz2 | 3 ++ kst.changes | 13 ++++++ kst.spec | 82 ++++++++++++++++++++++++----------- 6 files changed, 72 insertions(+), 54 deletions(-) delete mode 100644 fix-desktop.diff delete mode 100644 fixbuild_with_libcfitsio.diff delete mode 100644 kst-2.0.2.tar.bz2 create mode 100644 kst-2.0.3.tar.bz2 diff --git a/fix-desktop.diff b/fix-desktop.diff deleted file mode 100644 index 77ab47a..0000000 --- a/fix-desktop.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- src/kst/kst.desktop -+++ src/kst/kst.desktop -@@ -2,9 +2,8 @@ - Type=Application - Exec=kst -caption "%c" %i %m - Icon=kst --DocPath=kst/index.html - MimeType=application/x-kst --Categories=Qt;KDE;Science; -+Categories=Qt;KDE; - Name=Kst - Name[hi]=केएसटी - Name[ta]=கேஎஸ்டி diff --git a/fixbuild_with_libcfitsio.diff b/fixbuild_with_libcfitsio.diff deleted file mode 100644 index 8de23fe..0000000 --- a/fixbuild_with_libcfitsio.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 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.2.tar.bz2 b/kst-2.0.2.tar.bz2 deleted file mode 100644 index 6d5cf80..0000000 --- a/kst-2.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f49017c4e04cb0d57092e3171f448e853f60a48f4a2ad79515c973f53b2719a -size 10316390 diff --git a/kst-2.0.3.tar.bz2 b/kst-2.0.3.tar.bz2 new file mode 100644 index 0000000..d0bb35d --- /dev/null +++ b/kst-2.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:855bcc6b2d7c95b9b575a813530ba76596b6a4730b3fde7d2f1a534d01d4b730 +size 10558141 diff --git a/kst.changes b/kst.changes index dff3fe6..b05a308 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Apr 18 18:36:57 UTC 2011 - ctrippe@opensuse.org + +- Update to kst 2.0.3 + * cmake-based build system + * many improvements in the reading of ASCII files: extensive UI + overhaul and huge speedup + * support for metadata added for netCDF files (scalar and string + attributes) and ASCII (units and some data-file info) + * UI improvements (new icons, consistency with KDE HIG guidelines, + some dialogs reworked) + * lots of bugs and crashes fixed in less-often used parts of the code + ------------------------------------------------------------------- Wed Dec 15 18:43:46 UTC 2010 - ctrippe@gmx.net diff --git a/kst.spec b/kst.spec index cd1d145..d6841d1 100644 --- a/kst.spec +++ b/kst.spec @@ -2,6 +2,7 @@ # spec file for package kst (Version 2.0.2) # # Copyright (c) 2011 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 # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +16,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: kst -BuildRequires: gsl-devel kdebase4-workspace-devel libkde4-devel readline-devel +BuildRequires: gsl-devel readline-devel +BuildRequires: cmake BuildRequires: libcfitsio-devel libqt4-devel update-desktop-files +BuildRequires: Mesa-devel BuildRequires: fdupes BuildRequires: libnetcdf-devel -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildRequires: getdata-devel %endif License: GPLv2+ Group: Productivity/Graphics/Visualization/Graph Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -Version: 2.0.2 -Release: 2 -Url: http://extragear.kde.org/apps/kst/ +Version: 2.0.3 +Release: 1 +Url: http://kst-plot.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 @@ -73,7 +74,7 @@ License: GPLv2+ Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Group: Productivity/Scientific/Math Requires: kst = %{version} -Requires: libkde4-devel +Requires: libqt4-devel %description devel Kst is a data plotting and viewing program. Some of the features @@ -105,23 +106,28 @@ Authors: George Staikos Andrew Walker Rick Chern + Eli Filder + Mike Fenton + Matthew D Truch + Nicolas Brisset + Ted Kisner + The University of British Columbia + The University of Toronto + Sumus Technology Limited + Peter Kümmel + Zongyi Zang %prep -%setup -q -n %name-%{version} -%patch -%patch1 +%setup -q -n kst-%{version} %build -%ifarch x86_64 -export INSTALL_LIBDIR=lib64 -%endif -qmake -r ./kst.pro -make -j3 +cmake -Dkst_rpath=0 -Dkst_install_prefix=/usr -Dkst_install_libdir=%{_lib} ./cmake + %install -make INSTALL_ROOT=${RPM_BUILD_ROOT} install +%make_install +install -D -m 0644 src/images/kst.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/kst.png %suse_update_desktop_file kst Qt KDE Education Science Math -%kde_post_install %fdupes $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -133,17 +139,41 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%dir %{_libdir}/kst +%dir %{_libdir}/kst2 %{_bindir}/kst2 -%{_bindir}/dirfile_maker_new -%{_libdir}/libkst2app.so.* -%{_libdir}/libkst2math.so.* -%{_libdir}/libkst2lib.so.* -%{_libdir}/libkst2widgets.so.* -%{_libdir}/kst/* +%{_libdir}/libkst*.so.* +%{_libdir}/kst2/* +/usr/share/icons/hicolor/32x32/apps/kst.png +%dir /usr/share/services/kst +/usr/share/services/kst/* +/usr/share/applnk/Graphics/* +%dir /usr/share/apps/kst +/usr/share/apps/kst/* +/usr/share/mimelink/application/* +/usr/share/applications/* +%dir /usr/share/config +%dir /usr/share/config/colors +/usr/share/config/colors/IDL* +/usr/share/man/man1/kst2.1.gz +%dir /usr/share/servicetypes +%dir /usr/share/servicetypes/kst +/usr/share/servicetypes/kst/* +%dir /usr/share/applnk +%dir /usr/share/applnk/Graphics +%dir /usr/share/apps +%dir /usr/share/icons/hicolor +%dir /usr/share/icons/hicolor/32x32 +%dir /usr/share/icons/hicolor/32x32/apps +%dir /usr/share/mimelink +%dir /usr/share/mimelink/application +%dir /usr/share/services + + + %files devel %defattr(-,root,root) %{_libdir}/*.so +%{_libdir}/libkst2app.a %changelog