From ae31ee6b5ed7404b1f52da1e6f0a21df7afd4d819cee1f0032c8b44970c54243 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Aug 2009 16:15:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kst?expand=0&rev=15 --- fix-desktop-file.diff | 26 ---------- fix-desktop.diff | 13 +++++ kst-1.8.0.tar.bz2 | 3 -- kst-2.0.0-beta2.tar.bz2 | 3 ++ kst.changes | 6 +++ kst.spec | 105 +++++++++++++++------------------------- 6 files changed, 62 insertions(+), 94 deletions(-) delete mode 100644 fix-desktop-file.diff create mode 100644 fix-desktop.diff delete mode 100644 kst-1.8.0.tar.bz2 create mode 100644 kst-2.0.0-beta2.tar.bz2 diff --git a/fix-desktop-file.diff b/fix-desktop-file.diff deleted file mode 100644 index 0b7d6b9..0000000 --- a/fix-desktop-file.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- kst/src/kst/Makefile.am -+++ kst/src/kst/Makefile.am -@@ -14,11 +14,7 @@ KDE_ICON = kst - servicesdir = $(kde_servicetypesdir)/kst - services_DATA = kstplugin.desktop kstdatasourceplugin.desktop kstdataobjectplugin.desktop kstbasicplugin.desktop kstfilter.desktop kstextension.desktop - --appsinstalldir = $(datadir)/applications --appsinstall_DATA = kst.desktop -- --appsdir = $(kde_appsdir)/Graphics --apps_DATA = kst.desktop -+xdg_apps_DATA = kst.desktop - - mimedir = $(kde_mimedir)/application - mime_DATA = x-kst.desktop ---- kst/src/kst/kst.desktop -+++ kst/src/kst/kst.desktop -@@ -4,7 +4,7 @@ Exec=kst -caption "%c" %i %m - Icon=kst - DocPath=kst/index.html - MimeType=application/x-kst; --Categories=Qt;KDE;Utility;X-KDE-Science; -+Categories=Qt;KDE; - X-DCOP-ServiceType=Multi - X-KDE-StartupNotify=false - Name=Kst diff --git a/fix-desktop.diff b/fix-desktop.diff new file mode 100644 index 0000000..77ab47a --- /dev/null +++ b/fix-desktop.diff @@ -0,0 +1,13 @@ +--- 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/kst-1.8.0.tar.bz2 b/kst-1.8.0.tar.bz2 deleted file mode 100644 index bb5a8c3..0000000 --- a/kst-1.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd9b44bd521ed93d89d4185df7862fbd10295c43f0a21b9608b2e1a238133403 -size 18727441 diff --git a/kst-2.0.0-beta2.tar.bz2 b/kst-2.0.0-beta2.tar.bz2 new file mode 100644 index 0000000..42542f8 --- /dev/null +++ b/kst-2.0.0-beta2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cefca2117a3cbc8726b2e3dcad2445975c4fdd47cb932dbaab305f406b93ca0 +size 3591016 diff --git a/kst.changes b/kst.changes index e9d4ece..dedf381 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 14 22:02:33 CEST 2009 - tittiatcoke@gmail.com + +- Update to 2.0.0 beta 2 + * KDE4 version + ------------------------------------------------------------------- Sat Jul 11 15:33:11 CEST 2009 - tittiatcoke@gmail.com diff --git a/kst.spec b/kst.spec index f2a18e3..e069b3b 100644 --- a/kst.spec +++ b/kst.spec @@ -1,5 +1,5 @@ # -# spec file for package kst (Version 1.8.0) +# spec file for package kst (Version 2.0.0beta2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,20 @@ Name: kst -BuildRequires: gsl-devel kdelibs3-devel libnetcdf-devel readline-devel +BuildRequires: gsl-devel kdebase4-workspace-devel libkde4-devel readline-devel +BuildRequires: chrpath libcfitsio-devel libqt4-devel update-desktop-files %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later Group: Productivity/Graphics/Visualization/Graph Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -Version: 1.8.0 +Version: 2.0.0beta2 Release: 1 Url: http://extragear.kde.org/apps/kst/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: kst-%version.tar.bz2 -Requires: %{name}-lang = %{version} -Patch: fix-desktop-file.diff +Source0: %name-2.0.0-beta2.tar.bz2 +Patch: fix-desktop.diff %description Kst is a data plotting and viewing program. Some of the features @@ -65,16 +65,12 @@ Authors: Andrew Walker Rick Chern -%if %suse_version > 1020 -%lang_package -%endif - %package devel License: GPL v2 or later Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality Group: Productivity/Scientific/Math Requires: kst = %{version} -Requires: kdelibs3-devel +Requires: libkde4-devel %description devel Kst is a data plotting and viewing program. Some of the features @@ -108,27 +104,40 @@ Authors: Rick Chern %prep -%setup -q -n kst-%{version} +%setup -q -n %name %patch -pushd kst -popd -. /etc/opt/kde3/common_options -update_admin --no-unsermake %build -. /etc/opt/kde3/common_options -./configure $configkde --disable-final -make %{?jobs:-j %jobs} +export INSTDIR=/usr +qmake -r ./kst.pro +make -j3 %install -. /etc/opt/kde3/common_options -make DESTDIR=${RPM_BUILD_ROOT} 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 +%kde_post_install %if %suse_version > 1020 -%fdupes $RPM_BUILD_ROOT/opt/kde3 +%fdupes $RPM_BUILD_ROOT %endif -%find_lang kst +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 @@ -136,52 +145,18 @@ kde_post_install %clean rm -rf ${RPM_BUILD_ROOT} -%if %suse_version > 1020 - -%files -f kst.lang lang %files -%else - -%files -f kst.lang -%endif %defattr(-,root,root) -/opt/kde3/bin/d2asc -/opt/kde3/bin/kst -/opt/kde3/bin/kstcmd -/opt/kde3/%_lib/kde3/kst* -/opt/kde3/%_lib/kde3/plugins/designer/kstwidgets.* -/opt/kde3/%_lib/libkstwidgets.so.* -/opt/kde3/%_lib/libkstextdate.so.* -/opt/kde3/%_lib/libkstmath.so.* -/opt/kde3/%_lib/libkstapp.so.* -/opt/kde3/%_lib/libkst.so.* -/opt/kde3/%_lib/libkstwidgets.so -/opt/kde3/%_lib/libkstextdate.so -/opt/kde3/%_lib/libkstmath.so -/opt/kde3/%_lib/libkstapp.so -/opt/kde3/%_lib/libkst.so -/opt/kde3/share/applications/kde/kst.desktop -/opt/kde3/share/apps/kconf_update/kstautosave11.upd -/opt/kde3/share/apps/kconf_update/kstrcmisc11.upd -/opt/kde3/share/apps/kst -/opt/kde3/share/icons/*/*/*/addelogentry.* -/opt/kde3/share/icons/*/*/*/kst* -/opt/kde3/share/icons/*/*/*/launchelogbrowser.* -/opt/kde3/share/mimelnk/application/x-kst.desktop -/opt/kde3/share/services/kst -/opt/kde3/share/servicetypes/kst -/usr/share/man/man1/kst.1.gz -/opt/kde3/share/config/colors +%dir %{_libdir}/kst +%{_bindir}/kst +%{_libdir}/libkstapp.so.* +%{_libdir}/libkstmath.so.* +%{_libdir}/libkst.so.* +%{_libdir}/kst/* %files devel %defattr(-,root,root) -/opt/kde3/include/kst* -/opt/kde3/include/rwlock.h -/opt/kde3/%_lib/libkstwidgets.la -/opt/kde3/%_lib/libkstextdate.la -/opt/kde3/%_lib/libkstmath.la -/opt/kde3/%_lib/libkstapp.la -/opt/kde3/%_lib/libkst.la +%{_libdir}/*.so %changelog