rpms/qtiplot/devel qtiplot-0.9.8-manual.patch, NONE, 1.1 qtiplot-0.9.8-manualpath.patch, NONE, 1.1 qtiplot.spec, 1.27, 1.28 sources, 1.10, 1.11 qtiplot-QTeXEngine.patch, 1.2, NONE qtiplot-buildconf.patch, 1.4, NONE qtiplot-fitPlugins.patch, 1.1, NONE qtiplot-install-path.patch, 1.1, NONE qtiplot-liborigin2.patch, 1.2, NONE qtiplot-manual.patch, 1.2, NONE qtiplot-manualpath.patch, 1.1, NONE qtiplot-nonvoid-return.patch, 1.1, NONE
supercyper
supercyper at fedoraproject.org
Wed Jun 30 10:21:46 UTC 2010
Author: supercyper
Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29260
Modified Files:
qtiplot.spec sources
Added Files:
qtiplot-0.9.8-manual.patch qtiplot-0.9.8-manualpath.patch
Removed Files:
qtiplot-QTeXEngine.patch qtiplot-buildconf.patch
qtiplot-fitPlugins.patch qtiplot-install-path.patch
qtiplot-liborigin2.patch qtiplot-manual.patch
qtiplot-manualpath.patch qtiplot-nonvoid-return.patch
Log Message:
Update to 0.9.8
qtiplot-0.9.8-manual.patch:
qtiplot-0.9.7.12/manual/docbook-en/index.docbook | 2 +-
qtiplot-0.9.7.12/manual/qtiplot.dsl | 2 +-
qtiplot-0.9.7.12/manual/qtiplot_html.xsl | 2 +-
qtiplot-0.9.7.13/manual/Makefile | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE qtiplot-0.9.8-manual.patch ---
diff -urP qtiplot-0.9.7.12.org/manual/docbook-en/index.docbook qtiplot-0.9.7.12/manual/docbook-en/index.docbook
--- qtiplot-0.9.7.12.org/manual/docbook-en/index.docbook 2010-01-04 17:50:46.000000000 +0800
+++ qtiplot-0.9.7.12/manual/docbook-en/index.docbook 2010-02-09 22:55:30.378700748 +0800
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/sgml/docbook/xml-dtd-4.3/docbookx.dtd" [
<!ENTITY appname "QtiPlot">
<!ENTITY kappname "&appname;">
diff -auP qtiplot-0.9.7.13/manual/Makefile qtiplot-0.9.7.13/manual/Makefile
--- qtiplot-0.9.7.13/manual/Makefile 2009-10-19 17:01:27.000000000 +0800
+++ qtiplot-0.9.7.13/manual/Makefile 2010-03-18 10:37:47.288461638 +0800
@@ -1,4 +1,4 @@
-html-pdf: web pdf
+html-pdf: web
# we can't name the target "html", since there is already a folder with that name
# and so make thinks this target is already up to date
@@ -7,3 +7,4 @@
pdf:
dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
+install:
diff -urP qtiplot-0.9.7.12.org/manual/qtiplot.dsl qtiplot-0.9.7.12/manual/qtiplot.dsl
--- qtiplot-0.9.7.12.org/manual/qtiplot.dsl 2009-09-10 11:41:59.000000000 +0800
+++ qtiplot-0.9.7.12/manual/qtiplot.dsl 2010-02-09 22:56:10.922701438 +0800
@@ -6,7 +6,7 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
+<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets-1.79/html/docbook.dsl" CDATA DSSSL>
<!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
<!ENTITY docbook-help-stylesheet SYSTEM "./help.dsl" CDATA DSSSL>
diff -urP qtiplot-0.9.7.12.org/manual/qtiplot_html.xsl qtiplot-0.9.7.12/manual/qtiplot_html.xsl
--- qtiplot-0.9.7.12.org/manual/qtiplot_html.xsl 2009-09-10 11:41:59.000000000 +0800
+++ qtiplot-0.9.7.12/manual/qtiplot_html.xsl 2010-02-09 22:58:24.651702061 +0800
@@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/chunk.xsl"/>
<!-- html.stylesheet
The html.stylesheet parameter is either empty, indicating that no
qtiplot-0.9.8-manualpath.patch:
ApplicationWindow.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE qtiplot-0.9.8-manualpath.patch ---
--- qtiplot-0.9.7.13.org/qtiplot/src/core/ApplicationWindow.cpp 2010-03-17 15:32:17.000000000 +0800
+++ qtiplot-0.9.7.13/qtiplot/src/core/ApplicationWindow.cpp 2010-03-18 13:02:36.064460415 +0800
@@ -1427,7 +1427,7 @@
menuBar()->addMenu(help);
help->addAction(actionShowHelp);
- help->addAction(actionChooseHelpFolder);
+// help->addAction(actionChooseHelpFolder);
help->insertSeparator();
help->addAction(actionHomePage);
help->addAction(actionCheckUpdates);
@@ -5212,7 +5212,7 @@
scriptsDirPath = settings.value("/ScriptsDir", appPath).toString();
fitModelsPath = settings.value("/FitModelsDir", "").toString();
customActionsDirPath = settings.value("/CustomActionsDir", "").toString();
- helpFilePath = settings.value("/HelpFile", helpFilePath).toString();
+// helpFilePath = settings.value("/HelpFile", helpFilePath).toString();
d_translations_folder = settings.value("/Translations", d_translations_folder).toString();
d_python_config_folder = settings.value("/PythonConfigDir", d_python_config_folder).toString();
d_latex_compiler_path = settings.value("/LaTeXCompiler", d_latex_compiler_path).toString();
@@ -13504,8 +13504,8 @@
actionShowHelp->setShortcut( tr("Ctrl+H") );
connect(actionShowHelp, SIGNAL(activated()), this, SLOT(showHelp()));
- actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
- connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
+// actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
+// connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
actionRename = new QAction(tr("&Rename Window"), this);
connect(actionRename, SIGNAL(activated()), this, SLOT(rename()));
@@ -14335,7 +14335,7 @@
actionShowHelp->setMenuText(tr("&Help"));
actionShowHelp->setShortcut(tr("Ctrl+H"));
- actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
+// actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
actionRename->setMenuText(tr("&Rename Window"));
actionCloseWindow->setMenuText(tr("Close &Window"));
Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- qtiplot.spec 22 Apr 2010 14:12:37 -0000 1.27
+++ qtiplot.spec 30 Jun 2010 10:21:46 -0000 1.28
@@ -1,6 +1,6 @@
Name: qtiplot
Summary: Data Analysis and Scientific Plotting
-Version: 0.9.7.14
+Version: 0.9.8
Release: 1%{?dist}
URL: http://soft.proindependent.com/qtiplot.html
License: GPLv2+
@@ -9,35 +9,20 @@ Source0: http://download.berlios.de/qtip
Source1: http://soft.proindependent.com/misc/colormaps.tgz
Source2: %{name}.desktop
Source3: %{name}.xml
-#fix build.conf to use system-wide libs and enable CustomInstall
-Patch0: qtiplot-buildconf.patch
#fix manual building
-Patch1: qtiplot-manual.patch
-
-#fix installation paths of fitPlugins
-Patch3: qtiplot-fitPlugins.patch
-#fix installation paths and enable building of translation files
-Patch4: qtiplot-install-path.patch
-#fix origin.pri to use system-wide liborigin2
-Patch5: qtiplot-liborigin2.patch
-#fix qtiplot.pro to use system-wide QTeXEngine
-Patch6: qtiplot-QTeXEngine.patch
+Patch0: qtiplot-0.9.8-manual.patch
#disable choosing of help folder at runtime
-Patch7: qtiplot-manualpath.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: qtiplot-0.9.8-manualpath.patch
BuildRequires: qt-assistant-adp-devel
-BuildRequires: liborigin2-devel >= 06042009-3.20100422svn
+BuildRequires: liborigin2-devel >= 06042009-4.20100629svn
BuildRequires: QTeXEngine-devel
BuildRequires: muParser-devel >= 1.32
BuildRequires: gsl-devel
#use local copy till upstream catches up
#BuildRequires: qwt-devel
#BuildRequires: qwtplot3d-qt4-devel
-#BuildRequires: libxls-devel
BuildRequires: quazip-devel
BuildRequires: libpng-devel
-#python-devel comes with sip-devel
-#BuildRequires: python-devel
BuildRequires: PyQt4-devel
#sip-devel comes with PyQt4-devel
#BuildRequires: sip-devel
@@ -47,9 +32,9 @@ BuildRequires: dblatex
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
Requires: muParser%{?_isa} >= 1.32
-Requires: liborigin2%{?_isa} >= 06042009-3.20100422svn
+Requires: liborigin2%{?_isa} >= 06042009-4.20100629svn
Requires: hicolor-icon-theme
-
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
Scientists often need to use data analysis and plotting software.
@@ -59,7 +44,6 @@ project is to develop a free (open sourc
alternative to Origin.
%package doc
-
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
@@ -69,58 +53,80 @@ BuildArch: noarch
The %{name}-doc package contains documentation for the %{name}.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-#use system-wide libs of liborigin2 and QTeXEngine
-rm -rf 3rdparty/liborigin 3rdparty/QTeXEngine
-#fix docbook to adapt different versions of fedora
-sed -i "s/VER-REL/`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
-s/\./\\\./g"`/" manual/docbook-en/index.docbook
+
+#remove redundant variables
+sed -i '/QTI_ROOT\/3rdparty/d' build.conf.example
+sed -i '/manual.path = /d' qtiplot/qtiplot.pro
+sed -i '/manual.path = /d' qtiplot/qtiplot.pro
+sed -i '/documentation.path = /d' qtiplot/qtiplot.pro
+sed -i '/pythonconfig.path = /d' qtiplot/qtiplot.pro
+sed -i '/3rdparty\/QTeXEngine/d' qtiplot/qtiplot.pro
+sed -i '/3rdparty\/liborigin/d' qtiplot/src/origin/origin.pri
+
+#remove bundled liborigin2 and QTeXEngine
+rm -r 3rdparty/liborigin 3rdparty/QTeXEngine
+
+#fix docbook to for fedora < 14
+%if 0%{?fedora} > 13
+%else
+sed -i "s/xml-dtd-4\.3/xml-dtd-4\.3-`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
+s/\./\\\./g"`/" manual/docbook-en/index.docbook
+%endif
+
#fix default path for fitPlugins
-sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}/plugins\g" \
+sed -i 's\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}/plugins\g' \
qtiplot/src/core/ApplicationWindow.cpp
-#fix source files for debug package
-find %{_builddir}/%{name}-%{version} -name '*.h' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -name '*.hh' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -name '*.hpp' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -name '*.c' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -name '*.cc' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -name '*.cpp' -exec dos2unix {} \;
-find %{_builddir}/%{name}-%{version} -type d -exec chmod 0755 {} \;
-find %{_builddir}/%{name}-%{version} -type f -exec chmod 0644 {} \;
+
+find -type d -exec chmod 0755 {} \;
+find -type f -exec chmod 0644 {} \;
+
+#fix wrong-file-end-of-line-encoding
+find -name '*.h' -exec dos2unix -k {} \;
+find -name '*.hh' -exec dos2unix -k {} \;
+find -name '*.hpp' -exec dos2unix -k {} \;
+find -name '*.c' -exec dos2unix -k {} \;
+find -name '*.cc' -exec dos2unix -k {} \;
+find -name '*.cpp' -exec dos2unix -k {} \;
+#dos2unix gpl_licence.txt
+sed -i 's/\r//' gpl_licence.txt
+dos2unix -k qtiplot/*.txt
+dos2unix -k qtiplot/*.py
+dos2unix -k manual/html/qtiplot*
%build
cp -p build.conf.example build.conf
export PATH=%{_qt4_bindir}:$PATH
-%_qt4_qmake LIB=%{_libdir} QTIDOCDIR=%{_docdir}/%{name}-%{version}
+%{_qt4_qmake} MUPARSER_LIBS=-lmuparser \
+ GSL_INCLUDEPATH=%{_includedir}/gsl GSL_LIBS="-lgsl -lgslcblas" \
+ BOOST_LIBS="-lz -lQTeXEngine -lorigin2" \
+ QUAZIP_INCLUDEPATH=%{_includedir}/quazip QUAZIP_LIBS=-lquazip \
+ LIBPNG_LIBS=-lpng \
+ QWT_INCLUDEPATH=../3rdparty/qwt/src QWT_LIBS=../3rdparty/qwt/lib/libqwt.a \
+ QWT3D_INCLUDEPATH=../3rdparty/qwtplot3d/include QWT3D_LIBS=../3rdparty/qwtplot3d/lib/libqwtplot3d.a \
+ CONFIG+=" CustomInstall" \
+ %if %{_lib}==lib64
+ libsuff=64 \
+ %endif
+ INCLUDEPATH+=" %{_includedir}/minizip %{_includedir}/QTeXEngine %{_includedir}/liborigin2" \
+ manual.path=%{_docdir}/%{name}-%{version}/manual documentation.path=%{_docdir}/%{name}-%{version} \
+ pythonconfig.path=%{_datadir}/%{name}
+
+lupdate-qt4 -verbose qtiplot.pro
+lrelease-qt4 -verbose qtiplot.pro
make %{?_smp_mflags}
-#fix file encoding files
-#dos2unix gpl_licence.txt
-sed -i 's/\r//' gpl_licence.txt
-dos2unix qtiplot/qti_wordlist.txt
-dos2unix qtiplot/qtiplotrc.py
-dos2unix qtiplot/qtiUtil.py
-dos2unix manual/html/qtiplot*
%install
-rm -rf %{buildroot}
-make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install
+make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
#fix wrong manual path(important!!!)
mv %{buildroot}%{_docdir}/%{name}-%{version}/manual/html/* %{buildroot}%{_docdir}/%{name}-%{version}/manual
rmdir %{buildroot}%{_docdir}/%{name}-%{version}/manual/html
-#remove local copy qwt
+#remove local copy qwt/qwtplot3d
rm -rf %{buildroot}%{_prefix}/local
-#remove local copy qwtplot3d
rm -rf %{buildroot}%{_builddir}
-desktop-file-install --vendor="" \
+desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
mkdir -p %{buildroot}%{_datadir}/%{name}
tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/%{name}
@@ -128,13 +134,14 @@ tar -xf %{SOURCE1} -C %{buildroot}%{_dat
#remove symlinks
find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} \;
-#for the icon
+#add icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
-install -cpm 0644 qtiplot_logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-install -cpm 0644 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png \
+install -cpm 0644 qtiplot_logo.png \
+ %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -cpm 0644 qtiplot_logo.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qtiplot-project.png
-#add mime-info
+#add mimeinfo
mkdir -p %{buildroot}%{_datadir}/mime/packages
install -cpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
@@ -175,8 +182,11 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/manual
-
%changelog
+* Wed Jun 30 2010 Chen Lei <supercyper at 163.com> - 0.9.8-1
+- upstream to 0.9.8
+- remove some patches
+
* Thu Apr 22 2010 Chen Lei <supercyper at 163.com> - 0.9.7.14-1
- upstream to 0.9.7.14
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 30 Jun 2010 02:53:58 -0000 1.10
+++ sources 30 Jun 2010 10:21:46 -0000 1.11
@@ -1,2 +1,2 @@
-6a13673640f49cdcf9fb6a9958e71cc8 qtiplot-0.9.7.14.tar.bz2
+14e213a6fbbcce5824340768be528361 colormaps.tgz
5cd4d9a07a960b1aedf33f45fee5e21f qtiplot-0.9.8.tar.bz2
--- qtiplot-QTeXEngine.patch DELETED ---
--- qtiplot-buildconf.patch DELETED ---
--- qtiplot-fitPlugins.patch DELETED ---
--- qtiplot-install-path.patch DELETED ---
--- qtiplot-liborigin2.patch DELETED ---
--- qtiplot-manual.patch DELETED ---
--- qtiplot-manualpath.patch DELETED ---
--- qtiplot-nonvoid-return.patch DELETED ---
More information about the scm-commits
mailing list