From 9f1e6efb44e71b7e4bf067d8d439f47afbd5f52314f2b7035f24f21af283047a Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 3 Sep 2010 14:53:36 +0000
Subject: [PATCH] Accepting request 47040 from KDE:Distro:Factory

Copy from KDE:Distro:Factory/kst based on submit request 47040 from user llunak

OBS-URL: https://build.opensuse.org/request/show/47040
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=20
---
 kst-2.0.0-beta2.tar.bz2 |  3 ---
 kst-2.0.0.tar.bz2       |  3 +++
 kst.changes             |  7 ++++++
 kst.spec                | 51 +++++++++++++----------------------------
 4 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 kst-2.0.0-beta2.tar.bz2
 create mode 100644 kst-2.0.0.tar.bz2

diff --git a/kst-2.0.0-beta2.tar.bz2 b/kst-2.0.0-beta2.tar.bz2
deleted file mode 100644
index 42542f8..0000000
--- a/kst-2.0.0-beta2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cefca2117a3cbc8726b2e3dcad2445975c4fdd47cb932dbaab305f406b93ca0
-size 3591016
diff --git a/kst-2.0.0.tar.bz2 b/kst-2.0.0.tar.bz2
new file mode 100644
index 0000000..8d9f5cf
--- /dev/null
+++ b/kst-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e13658e6f41551b0ef71d9e4d81444447af76d9017e385ad7e9a3f8bfc0c7315
+size 10091947
diff --git a/kst.changes b/kst.changes
index dedf381..9a20bee 100644
--- a/kst.changes
+++ b/kst.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 31 17:55:22 UTC 2010 - ctrippe@gmx.net
+
+- Update to 2.0.0
+  * Fixes bnc#541957
+- add export INSTALL_LIBDIR=lib64 in the build section fixes bnc#548228
+
 -------------------------------------------------------------------
 Tue Jul 14 22:02:33 CEST 2009 - tittiatcoke@gmail.com
 
diff --git a/kst.spec b/kst.spec
index e069b3b..fc4901a 100644
--- a/kst.spec
+++ b/kst.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kst (Version 2.0.0beta2)
+# spec file for package kst (Version 2.0.0)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,18 +20,16 @@
 
 Name:           kst
 BuildRequires:  gsl-devel kdebase4-workspace-devel libkde4-devel readline-devel
-BuildRequires:  chrpath libcfitsio-devel libqt4-devel update-desktop-files
-%if %suse_version > 1020
+BuildRequires:  libcfitsio-devel libqt4-devel update-desktop-files
 BuildRequires:  fdupes
-%endif
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
-Version:        2.0.0beta2
+Version:        2.0.0
 Release:        1
 Url:            http://extragear.kde.org/apps/kst/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %name-2.0.0-beta2.tar.bz2
+Source0:        %name-2.0.0.tar.bz2
 Patch:          fix-desktop.diff
 
 %description
@@ -66,7 +64,7 @@ Authors:
     Rick Chern <rchern@interchange.ubc.ca>
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
 Group:          Productivity/Scientific/Math
 Requires:       kst = %{version}
@@ -104,40 +102,22 @@ Authors:
     Rick Chern <rchern@interchange.ubc.ca>
 
 %prep 
-%setup -q -n %name
+%setup -q -n %name-2.0.0
 %patch
 
 %build
 export INSTDIR=/usr
+%ifarch x86_64
+export INSTALL_LIBDIR=lib64
+%endif 
 qmake -r ./kst.pro
 make -j3
 
 %install
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib/kst  
-mv ${RPM_BUILD_ROOT}/usr/plugin/* ${RPM_BUILD_ROOT}/usr/lib/kst
 %suse_update_desktop_file kst Qt KDE Education Science Math
 %kde_post_install
-%if %suse_version > 1020
 %fdupes $RPM_BUILD_ROOT
-%endif
-cd ${RPM_BUILD_ROOT}
-cd usr/bin  
-for i in `ls`  
-   do chrpath -r %{_libdir}:/usr/lib/kst $i  
-done  
-cd ../lib  
-for i in `ls lib*`  
-   do chrpath -r %{_libdir}:/usr/lib/kst $i  
-done  
-cd ../lib/kst  
-for i in `ls`  
-   do chrpath -r %{_libdir}:/usr/lib/kst $i  
-done  
-%ifarch x86_64    
-  cd $RPM_BUILD_ROOT/usr  
-  mv lib lib64    
-%endif    
 
 %post -p /sbin/ldconfig
 
@@ -149,10 +129,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root)
 %dir %{_libdir}/kst  
-%{_bindir}/kst  
-%{_libdir}/libkstapp.so.*  
-%{_libdir}/libkstmath.so.*  
-%{_libdir}/libkst.so.*  
+%{_bindir}/kst2  
+%{_libdir}/libkst2app.so.*  
+%{_libdir}/libkst2math.so.*  
+%{_libdir}/libkst2lib.so.*  
+%{_libdir}/libkst2widgets.so.*
 %{_libdir}/kst/*  
 
 %files devel