rpms/kst/devel kst-fix-F-command-line.diff, NONE, 1.1 kst.spec, 1.26, 1.27

[Matthew D Truch (mtruch)]

Author: mtruch

Update of /cvs/extras/rpms/kst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2068

Modified Files:
	kst.spec 
Added Files:
	kst-fix-F-command-line.diff 
Log Message:
Pick up -F command line fix from upstream (committed to upstream trunk).


kst-fix-F-command-line.diff:

--- NEW FILE kst-fix-F-command-line.diff ---
--- branches/extragear/kde3/graphics/kst/src/libkst/kstrvector.cpp	2008/05/07 19:37:37	805175
+++ branches/extragear/kde3/graphics/kst/src/libkst/kstrvector.cpp	2008/05/07 19:38:09	805176
@@ -105,10 +105,13 @@
     // provider overrides filename
     in_file = in_provider;
   }
+
   if (in_file) {
     // use datasource as tag context for this RVector
     // allow unique vector names to be displayed at top-level
-    setTagName(KstObjectTag(tag().tag(), in_file->tag(), false));
+    if (o_file == "|") {
+      setTagName(KstObjectTag(tag().tag(), in_file->tag(), false));
+    }
   }
 
   if (o_n > -2) {


Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kst.spec	24 Apr 2008 21:37:19 -0000	1.26
+++ kst.spec	10 May 2008 20:46:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.6.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -9,6 +9,9 @@
 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)
 
+#From KDE svn revision 805176
+Patch0:     kst-fix-F-command-line.diff
+
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -78,6 +81,7 @@
 
 %prep
 %setup -q
+%patch0 -p4
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -235,6 +239,11 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Sat May 10 2008 Matthew Truch <matt at truch.net> - 1.6.0-3
+- Pick up patch from upstream fixing -F command line option
+  Upstream KDE svn revision 805176
+  Fixes upstream reported KDE BUG:161766
+
 * Thu Apr 24 2008 Matthew Truch <matt at truch.net> - 1.6.0-2
 - Also remove PlanckIDEF datasoure.