[kst] 2.0.3 final.

Jon Ciesla limb at fedoraproject.org
Wed Jun 1 16:43:48 UTC 2011 

commit 95efaafeb44ea96f06ae2f197df30c264125d2e9
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Jun 1 11:43:10 2011 -0500

    2.0.3 final.

 .gitignore |    1 +
 kst.spec   |  198 +++++++++++++++---------------------------------------------
 sources    |    2 +-
 3 files changed, 51 insertions(+), 150 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a43f33e..25af58d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 kst-1.8.0.tar.gz
+/kst-2.0.3.tar.gz
diff --git a/kst.spec b/kst.spec
index a8740be..dc99aab 100644
--- a/kst.spec
+++ b/kst.spec
@@ -1,23 +1,19 @@
 Name:       kst
-Version:    1.8.0
-Release:    12%{?dist}
-Summary:    A data viewing program for KDE
+Version:    2.0.3
+Release:    1%{?dist}
+Summary:    A data viewing program
 
 Group:      Applications/Engineering
 License:    GPLv3
 URL:        http://kst.kde.org/
 Source0:    ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
+#Source0:    Kst-2.0.3-rc1-sources.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:     kst-except.diff
-
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: gettext 
-BuildRequires: gsl-devel
-BuildRequires: readline-devel ncurses-devel
-BuildRequires: kdelibs3-devel
+BuildRequires: gsl-devel cmake
 BuildRequires: cfitsio-devel netcdf-devel
 BuildRequires: getdata-devel muParser-devel
 BuildRequires: desktop-file-utils
@@ -26,7 +22,7 @@ BuildRequires: autoconf automake
 %description
 Kst is a real-time data viewing and plotting tool with basic data analysis 
 functionality. Kst contains many powerful built-in features and is 
-expandable with plugins and extensions. Kst is a KDE application.
+expandable with plugins and extensions. 
 
 Main features of kst include:
   * Robust plotting of live "streaming" data.
@@ -78,7 +74,7 @@ Requires:   cfitsio = %(pkg-config --modversion cfitsio 2>/dev/null || echo 0)
 
 %description fits
 A plugin allowing kst to open and read data and images contained within 
-fits files.  This includes healpix encoded fits files, and lfiio data.
+fits files. 
 
 %package getdata
 Summary:    getdata datasource plugin for kst
@@ -90,69 +86,21 @@ A plugin allowing kst to open and read data in getdata (dirfile) format.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export KDEDIR=%{_prefix}
-#Libtool hack for 1.8.0 tarball.
-touch aclocal.m4
-touch Makefile.in
-touch configure
-touch config.h.in
-#End Hack.
-%configure --disable-dependency-tracking --disable-static \
-  --disable-rpath \
-  --with-qt-libraries=$QTDIR/lib \
-  --with-qt-includes=$QTDIR/include \
-  --with-extra-includes=%{_includedir}/cfitsio:%{_includedir}/netcdf \
-  --with-extra-libs=%{_libdir}:%{_libdir}/netcdf --disable-debug
-make %{?_smp_mflags}
+%cmake -Dkst_merge_files=1 -Dkst_rpath=0 \
+  -Dkst_install_prefix=%{_prefix} -Dkst_install_libdir=%{_lib} \
+  -Dkst_test=1 cmake
+make %{?_smp_mflags} kst2
+
+%check
+#make test
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 make DESTDIR=%{buildroot} SUID_ROOT="" install
-
-# Delete the nasty little .la files
-# which we can't do as kst doesn't run without them.
-#find %{buildroot} -wholename '*.la' | xargs rm -f
-
-# Delete wmap and scuba2 datasources; it's a packaging bug at the 
-# kst upstream end that they are installed in 1.8.0 (they are unfinished?).
-rm -f %{buildroot}%{_libdir}/kde3/kstdata_scuba.la \
-      %{buildroot}%{_libdir}/kde3/kstdata_scuba.so \
-      %{buildroot}%{_libdir}/kde3/kstdata_wmap.la \
-      %{buildroot}%{_libdir}/kde3/kstdata_wmap.so \
-      %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.so \
-      %{buildroot}%{_libdir}/kde3/kstdata_planckIDEF.la \
-      %{buildroot}%{_datadir}/services/kst/kstdata_scuba.desktop \
-      %{buildroot}%{_datadir}/services/kst/kstdata_wmap.desktop \
-      %{buildroot}%{_datadir}/services/kst/kstdata_planckIDEF.desktop \
-      %{buildroot}%{_datadir}/applications/kde/kst.desktop
-
-# Delete installed fonts; they are unused and improperly packaged.
-rm -rf %{buildroot}%{_datadir}/apps/kst/fonts
-
-%find_lang %{name}
-
-# Make documentation symlinks relative
-for x in %{buildroot}%{_defaultdocdir}/HTML/*/%{name}/
-do
-  ln -sf ../common $x
-done
-
-# Move desktop file to proper location
-desktop-file-install --vendor=fedora \
-  --add-category X-Fedora \
-  --add-category Graphics \
-  --add-category Qt \
-  --add-category KDE \
-  --delete-original \
-  --dir %{buildroot}%{_datadir}/applications/ \
-  %{buildroot}%{_datadir}/applnk/Graphics/kst.desktop
-mv %{buildroot}%{_datadir}/applications/fedora-kst.desktop \
-   %{buildroot}%{_datadir}/applications/kst.desktop
+rm -f %{buildroot}%{_bindir}/test_*
 
 %clean
 rm -rf %{buildroot}
@@ -161,113 +109,65 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
+%doc INSTALL AUTHORS README COPYING COPYING-DOCS COPYING.LGPL 
 
 #binaries
-%{_bindir}/kst
-%{_bindir}/kstcmd
-%{_bindir}/d2asc
-#libraries
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-#update
-%{_datadir}/apps/kconf_update/kstautosave11.upd
-%{_datadir}/apps/kconf_update/kstrcmisc11.upd
-#data plugins
-%{_libdir}/kde3/kstdata_ascii.*
-%{_libdir}/kde3/kstdata_dirfile.*
-%{_libdir}/kde3/kstdata_frame.*
-%{_libdir}/kde3/kstdata_indirect.*
-%{_libdir}/kde3/kstdata_qimagesource.*
+%{_bindir}/kst*
+%{_libdir}/libkst*so.*
+%{_libdir}/kst2/plugins/libkst2_dataobject*so
+%{_libdir}/kst2/plugins/libkst2_fi*so
+
+%{_datadir}/applications/kst.desktop
+%{_datadir}/applnk/Graphics/kst.desktop
+%{_datadir}/mimelink/application/x-kst.desktop
+%{_datadir}/services/kst/kstplugin_*desktop
+%{_datadir}/servicetypes/kst/kst*desktop
+%{_datadir}/apps/kst/kstui.rc
+%{_datadir}/man/man1/kst*
+
+%{_libdir}/kst2/plugins/libkst2_datasource_ascii.so
 %{_datadir}/services/kst/kstdata_ascii.desktop
-%{_datadir}/services/kst/kstdata_dirfile.desktop
-%{_datadir}/services/kst/kstdata_frame.desktop
-%{_datadir}/services/kst/kstdata_indirect.desktop
+
+%{_libdir}/kst2/plugins/libkst2_datasource_qimagesource.so
 %{_datadir}/services/kst/kstdata_qimagesource.desktop
-%{_datadir}/services/kst/kstobject_*.desktop
-%{_datadir}/servicetypes/kst/kstdatasourceplugin.desktop
-%{_datadir}/servicetypes/kst/kstbasicplugin.desktop
-%{_datadir}/servicetypes/kst/kstdataobjectplugin.desktop
-#plugins
-%{_libdir}/kde3/kstplugins
-%{_libdir}/kde3/kstobject_*
-%dir %{_datadir}/servicetypes/kst
-%{_datadir}/servicetypes/kst/kstplugin.desktop
-%{_datadir}/servicetypes/kst/kstfilter.desktop
-%{_libdir}/kde3/plugins/designer/
-#extensions
-%{_libdir}/kde3/kstextension_*
-%dir %{_datadir}/services/kst
-%{_datadir}/services/kst/kstextension_*.desktop
-%dir %{_datadir}/apps/kst
-%{_datadir}/apps/kst/kstextension_*.rc
-%{_datadir}/servicetypes/kst/kstextension.desktop
-# UI file
-%{_datadir}/apps/kst/kstui.rc
-#desktop file
-%{_datadir}/mimelnk/application/x-kst.desktop
-%{_datadir}/applications/kst.desktop
-#icons
-%{_datadir}/icons/hicolor/22x22/actions/*.png
-%{_datadir}/icons/locolor/16x16/apps/kst.png
-%{_datadir}/icons/locolor/32x32/apps/kst.png
-%{_datadir}/icons/hicolor/16x16/mimetypes/kst.png
-%{_datadir}/icons/hicolor/32x32/mimetypes/kst.png
-%{_datadir}/icons/locolor/16x16/mimetypes/kst.png
-%{_datadir}/icons/locolor/32x32/mimetypes/kst.png
-%{_datadir}/apps/kst/pics/*.png
-#other
-%{_datadir}/config/colors
-%{_mandir}/man1/kst.1.gz
+
+%{_libdir}/kst2/plugins/libkst2_datasource_sampledatasource.so
+%{_datadir}/services/kst/kstdata_sampledatasource.desktop
+
+%{_datadir}/config/colors/IDL*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kstdatasource.h
-%{_includedir}/kstobject.h
-%{_includedir}/kst_export.h
-%{_includedir}/kstsharedptr.h
-%{_includedir}/rwlock.h
-%{_includedir}/kstdateparser.h
-%{_includedir}/kstwaitcondition.h
-%{_includedir}/kstext*.h
-%{_includedir}/kstobjectcollection.h
-%{_libdir}/lib*.so
+%{_libdir}/libkst*a
+%{_libdir}/libkst*so
 
 %files docs
 %defattr(-,root,root,-)
-%{_datadir}/doc/HTML/*/kst
-%{_datadir}/apps/kst/tutorial
+%{_datadir}/apps/kst/tutorial/gyrodata.dat
 
 %files fits
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kstdata_fitsimage.*
-%{_libdir}/kde3/kstdata_healpix.*
-%{_libdir}/kde3/kstdata_lfiio.*
+%{_libdir}/kst2/plugins/libkst2_datasource_fitsimage.so
 %{_datadir}/services/kst/kstdata_fitsimage.desktop
-%{_datadir}/services/kst/kstdata_healpix.desktop
-%{_datadir}/services/kst/kstdata_lfiio.desktop
 
 %files netcdf
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kstdata_netcdf.*
+%{_libdir}/kst2/plugins/libkst2_datasource_netcdf.so
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %files getdata
 %defattr(-,root,root,-)
-%{_libdir}/kde3/kstdata_dirfile.*
-%{_datadir}/services/kst/kstdata_dirfile.desktop
+%{_libdir}/kst2/plugins/libkst2_datasource_dirfilesource.so
+%{_datadir}/services/kst/kstdata_dirfilesource.desktop
 
 %changelog
-* Thu Apr 21 2011 Matthew Truch <matt at truch.net> - 1.8.0-12
-- Bump to pickup new cfitsio.
-
-* Wed Apr 6 2011 Matthew Truch <matt at truch.net> - 1.8.0-11
-- Bump to pickup new netcdf.
+* Wed Jun 01 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.3-1
+- Update to 2.0.3 final.
 
-* Sun Feb 20 2011 Matthew Truch <matt at truch.net> - 1.8.0-10
-- Bump to pickup new getdata.
+* Fri Feb 18 2011 Matthew Truch <matt at truch.net> - 2.0.3-0.rc1
+- Major overhaul to kst2.  
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index ddf9189..17ade91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd137c317d46e268cff630e2a9bc3461  kst-1.8.0.tar.gz
+0c2301b5ea1495e53d6a74420cc4afd5  kst-2.0.3.tar.gz

More information about the scm-commits mailing list