rpms/kst/devel kst-except.diff,NONE,1.1 kst.spec,1.34,1.35

[Matthew D Truch]

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12795

Modified Files:
	kst.spec 
Added Files:
	kst-except.diff 
Log Message:
Upstream 1.8.0


kst-except.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'kst-except.diff'

Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- kst.spec	12 Mar 2009 17:33:25 -0000	1.34
+++ kst.spec	22 Jul 2009 04:47:42 -0000	1.35
@@ -1,6 +1,6 @@
 Name:       kst
-Version:    1.7.0
-Release:    6%{?dist}
+Version:    1.8.0
+Release:    1%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -8,7 +8,8 @@ License:    GPLv3
 URL:        http://kst.kde.org/
 Source0:    ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/scientific/kst-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:     saveperiod.diff
+
+Patch0:     kst-except.diff
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -18,6 +19,7 @@ BuildRequires: gsl-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: kdelibs3-devel
 BuildRequires: cfitsio-devel netcdf-devel
+BuildRequires: getdata-devel muParser-devel
 BuildRequires: desktop-file-utils
 BuildRequires: autoconf automake
 
@@ -79,6 +81,14 @@ Requires:   cfitsio = %(pkg-config --mod
 A plugin allowing kst to open and read data and images contained within 
 fits files.  This includes healpix encoded fits files, and lfiio data.
 
+%package getdata
+Summary:    getdata datasource plugin for kst
+Group:      Applications/Engineering
+Requires:   %{name} = %{version}-%{release}
+
+%description getdata
+A plugin allowing kst to open and read data in getdata (dirfile) format.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -104,7 +114,7 @@ make DESTDIR=%{buildroot} SUID_ROOT="" i
 #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.6.0 (they are unfinished?).
+# 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 \
@@ -144,8 +154,8 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc ChangeLog INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
+%defattr(-,root,root,-)
+%doc INSTALL AUTHORS README COPYING kst/RELEASE.NOTES kst/NEWS
 
 #binaries
 %{_bindir}/kst
@@ -207,7 +217,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/kst.1.gz
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kstdatasource.h
 %{_includedir}/kstobject.h
 %{_includedir}/kst_export.h
@@ -220,12 +230,12 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 
 %files docs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/doc/HTML/*/kst
 %{_datadir}/apps/kst/tutorial
 
 %files fits
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/kstdata_fitsimage.*
 %{_libdir}/kde3/kstdata_healpix.*
 %{_libdir}/kde3/kstdata_lfiio.*
@@ -234,11 +244,23 @@ rm -rf %{buildroot}
 %{_datadir}/services/kst/kstdata_lfiio.desktop
 
 %files netcdf
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/kstdata_netcdf.*
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
+%files getdata
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kstdata_dirfile.*
+%{_datadir}/services/kst/kstdata_dirfile.desktop
+
 %changelog
+* Sat Jul 18 2009 Matthew Truch <matt at truch.net> - 1.8.0-1
+- Upstream kst 1.8.0
+- Drop patch for saveperiod as it's included in upstream 1.8.0
+- Separate out getdata support to subpackage (requires getdata)
+- Include muParser support for general non-linear fit plugin.
+- Bump for mass rebuild.
+
 * Tue Mar 10 2009 Matthew Truch <matt at truch.net> - 1.7.0-6
 - Make cfitsio explicit version check work.