Author: gotar Date: Sat Jun 27 15:08:50 2009 GMT Module: packages Tag: HEAD ---- Log message: - upgraded to 0.36; - added gcc43 patch, BR: ta-lib-devel, - all paths hardcoded to /usr/local 'to make distro maintainers rejoice'... - qmake debug release disabled, no other way to pass CXXFLAGS? - fixed docs location, now make install works (removed unused? directories)
---- Files affected: packages/qtstalker: qtstalker.spec (1.29 -> 1.30) , qtstalker-gcc43.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qtstalker/qtstalker.spec diff -u packages/qtstalker/qtstalker.spec:1.29 packages/qtstalker/qtstalker.spec:1.30 --- packages/qtstalker/qtstalker.spec:1.29 Wed Apr 11 01:19:12 2007 +++ packages/qtstalker/qtstalker.spec Sat Jun 27 17:08:44 2009 @@ -2,20 +2,22 @@ Summary: Technical stock analysis charting app based on the Qt toolkit Summary(pl.UTF-8): Program do analiz technicznych giełdy oparty na bibliotece Qt Name: qtstalker -Version: 0.33 +Version: 0.36 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/qtstalker/%{name}-%{version}.tar.gz -# Source0-md5: 03a8a0fd3fe6e88eac94701cc897e703 +# Source0-md5: 599589c4e84e828bd888fce6be81dab3 Source1: Qtstalker.desktop Source2: %{name}.png +Patch0: %{name}-gcc43.patch URL: http://qtstalker.sourceforge.net/ BuildRequires: db-devel >= 4.2 BuildRequires: libstdc++-devel BuildRequires: qmake BuildRequires: qt-devel >= 1:3.0 BuildRequires: sed >= 4.0 +BuildRequires: ta-lib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -39,36 +41,36 @@ przenośność i zarządzanie zasobami. %prep -%setup -q -n %{name} +%setup -q +%patch0 -p1 + +sed -i -e 's|/usr/local/|/usr/|' \ + {plugins/quote/{Yahoo/Yahoo,NYBOT/NYBOT,CSV/CSV,CME/CME},docs/docs,src/src,lib/lib}.pro \ + {src/Qtstalker,lib/{Config,RcFile}}.cpp + +sed -i -e 's/^\(CONFIG +=.* thread warn_on\) debug/\1/' lib/lib.pro src/src.pro + +sed -i -e 's/^\(QMAKE_CXXFLAGS += -rdynamic -ffast-math\)/\1 %{rpmcflags}/' src/src.pro +sed -i -e 's/^\(QMAKE_CXXFLAGS += -ffast-math\)/\1 %{rpmcflags}/' lib/lib.pro plugin.config + +sed -i -e 's|/usr/share/doc/qtstalker/html|%{_docdir}/%{name}-%{version}|' docs/docs.pro lib/Config.cpp %build export QMAKESPEC="%{_datadir}/qt/mkspecs/linux-g++/" export QTDIR="%{_prefix}" export INSTALL_ROOT=$RPM_BUILD_ROOT -for f in `find . -name \*.pro`; do - sed -i -e 's/^\(QMAKE_CXXFLAGS += -ffast-math \)-Os/\1%{rpmcflags}/' $f -done -sed -i -e 's/^\(QMAKE_CXXFLAGS += -ffast-math \)-Os/\1%{rpmcflags}/'\ - plugin.config - -sed -i -e 's/qtstalker\/html/qtstalker-%{version}/' lib/Config.cpp - qmake -o Makefile qtstalker.pro %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}} -install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{chart,co,db,indicator,quote} -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n - -install lib/libqtstalker.so.*.*.* $RPM_BUILD_ROOT%{_libdir} -install plugins/indicator/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/indicator -install plugins/quote/*/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/quote -install src/qtstalker $RPM_BUILD_ROOT%{_bindir} -#install i18n/*qm $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n +install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} + +export QTDIR="%{_prefix}" +%{__make} install \ + INSTALL_ROOT=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -81,14 +83,17 @@ %files %defattr(644,root,root,755) -%doc docs/{AUTHORS,BUGS,CHANGELOG,TODO,*.html,*.png} +%doc docs/{AUTHORS,BUGS,CHANGELOG-0.36,TODO,*.html,*.png,qtstalker.*s,indicator,pastchanges} misc/CUS_examples %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/* -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/i18n +%attr(755,root,root) %{_libdir}/*.so.* +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/quote +%attr(755,root,root) %{_libdir}/%{name}/quote/*.%{version}.so +%{_datadir}/%{name} +#%dir %{_datadir}/%{name}/i18n #%{_datadir}/%{name}/i18n/* %{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%{_pixmapsdir}/*.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -96,6 +101,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2009/06/27 15:08:44 gotar +- upgraded to 0.36; +- added gcc43 patch, BR: ta-lib-devel, +- all paths hardcoded to /usr/local 'to make distro maintainers rejoice'... +- qmake debug release disabled, no other way to pass CXXFLAGS? +- fixed docs location, now make install works (removed unused? directories) + Revision 1.29 2007/04/10 23:19:12 shadzik - qt-devel epoch 1 ================================================================ Index: packages/qtstalker/qtstalker-gcc43.patch diff -u /dev/null packages/qtstalker/qtstalker-gcc43.patch:1.1 --- /dev/null Sat Jun 27 17:08:50 2009 +++ packages/qtstalker/qtstalker-gcc43.patch Sat Jun 27 17:08:44 2009 @@ -0,0 +1,22 @@ +diff -purN qtstalker-0.36.orig/lib/UpgradeMessage.cpp qtstalker-0.36/lib/UpgradeMessage.cpp +--- qtstalker-0.36.orig/lib/UpgradeMessage.cpp 2007-06-05 07:51:18.000000000 +0200 ++++ qtstalker-0.36/lib/UpgradeMessage.cpp 2009-06-27 16:00:09.000000000 +0200 +@@ -23,6 +23,7 @@ + #include "Config.h" + #include "DbPlugin.h" + #include "Traverse.h" ++#include <cstdlib> + #include <qlayout.h> + #include <qwidget.h> + #include <qstring.h> +diff -purN qtstalker-0.36.orig/src/IndicatorPage.cpp qtstalker-0.36/src/IndicatorPage.cpp +--- qtstalker-0.36.orig/src/IndicatorPage.cpp 2009-06-27 16:04:19.000000000 +0200 ++++ qtstalker-0.36/src/IndicatorPage.cpp 2009-06-27 16:03:17.000000000 +0200 +@@ -36,6 +36,7 @@ + #include "../pics/newchart.xpm" + #include "../pics/move.xpm" + #include "../pics/dirclosed.xpm" ++#include <cstdlib> + #include <qcursor.h> + #include <qaccel.h> + #include <qfile.h> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qtstalker/qtstalker.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
