From eda58674567badd34709254009771add2ebeec6a Mon Sep 17 00:00:00 2001
From: Chen Lei <supercyper@163.com>
Date: Oct 17 2010 05:34:36 +0000
Subject: Update to 0.9.8.3


---

diff --git a/.gitignore b/.gitignore
index 2eddd13..fbb7319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
+/qtiplot-0.9.8.3.tar.bz2
 /colormaps.tgz
-/qtiplot-0.9.8.2.tar.bz2
diff --git a/qtiplot-0.9.8-manual.patch b/qtiplot-0.9.8-manual.patch
deleted file mode 100644
index 59fbcb5..0000000
--- a/qtiplot-0.9.8-manual.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 
-
diff --git a/qtiplot-0.9.8.3-manual.patch b/qtiplot-0.9.8.3-manual.patch
new file mode 100644
index 0000000..f77ea7f
--- /dev/null
+++ b/qtiplot-0.9.8.3-manual.patch
@@ -0,0 +1,47 @@
+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 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 
+
diff --git a/qtiplot-0.9.8.3-origin-build-failure.patch b/qtiplot-0.9.8.3-origin-build-failure.patch
new file mode 100644
index 0000000..38f69ef
--- /dev/null
+++ b/qtiplot-0.9.8.3-origin-build-failure.patch
@@ -0,0 +1,11 @@
+--- qtiplot-0.9.8.3/qtiplot/src/origin/importOPJ.cpp.orig	2010-10-17 11:33:05.735213467 +0800
++++ qtiplot-0.9.8.3/qtiplot/src/origin/importOPJ.cpp	2010-10-17 11:32:32.916212773 +0800
+@@ -790,7 +790,7 @@
+ 					case Origin::GraphCurve::TextPlot:
+ 						style = Origin::GraphCurve::TextPlot;
+ 						break;
+-					case Origin::GraphCurve::XYZContour:
++					//case Origin::GraphCurve::XYZContour:
+ 					case Origin::GraphCurve::Contour:
+ 						style = Origin::GraphCurve::Contour;
+ 						break;
diff --git a/qtiplot.spec b/qtiplot.spec
index 24e6245..ef3db86 100644
--- a/qtiplot.spec
+++ b/qtiplot.spec
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting Software
-Version:	0.9.8.2
-Release:	2%{?dist}
+Version:	0.9.8.3
+Release:	1%{?dist}
 URL:		http://soft.proindependent.com/qtiplot.html
 License:	GPLv2+
 Group:		Applications/Engineering
@@ -10,27 +10,30 @@ Source1:	http://soft.proindependent.com/misc/colormaps.tgz
 Source2:	%{name}.desktop
 Source3:	%{name}.xml
 # Fix manual building
-Patch0:		%{name}-0.9.8-manual.patch
+Patch0:		%{name}-0.9.8.3-manual.patch
 # Disable choosing of help folder at runtime
 Patch1:		%{name}-0.9.8-manualpath.patch
+# Fix origin module building
+Patch2:		%{name}-0.9.8.3-origin-build-failure.patch
+BuildRequires:	qt4-devel
+%if 0%{?fedora} >= 13
 BuildRequires:	qt-assistant-adp-devel
-BuildRequires:	muParser-devel >= 1.32
+%endif
 BuildRequires:	gsl-devel
+BuildRequires:	muParser-devel >= 1.32
+BuildRequires:	libpng-devel
 # Use local copy till upstream catches up
 #BuildRequires:	qwt-devel
 #BuildRequires:	qwtplot3d-qt4-devel
-BuildRequires:	QTeXEngine-devel
-BuildRequires:	PyQt4-devel 
-# sip-devel comes with PyQt4-devel
-BuildRequires:	libpng-devel
-BuildRequires:	EmfEngine-devel
 BuildRequires:	quazip-devel
 BuildRequires:	liborigin2-devel >= 06042009-4.20100629svn
+BuildRequires:	EmfEngine-devel
+BuildRequires:	QTeXEngine-devel
+BuildRequires:	PyQt4-devel
+# sip-devel comes with PyQt4-devel
 BuildRequires:	docbook-utils
 BuildRequires:	docbook-style-xsl
-BuildRequires:	dblatex
 BuildRequires:	desktop-file-utils
-BuildRequires:	dos2unix
 Requires:	muParser%{?_isa} >= 1.32
 Requires:	liborigin2%{?_isa} >= 06042009-4.20100629svn
 Requires:	hicolor-icon-theme
@@ -42,7 +45,7 @@ systems there is a well known and widely used software called Origin, which is
 not free, of course. The purpose of this project is to develop a free (open 
 source), platform independent alternative to Origin. QtiPlot can already
 successfully replace Origin in students computer classes and is being used in
-universities and reseach institutes all over the world. QtiPlot is being
+universities and research institutes all over the world. QtiPlot is being
 actively improved, all your suggestions to our "wish to" list and all your
 contributions are most welcome!
 
@@ -60,6 +63,7 @@ The %{name}-doc package contains documentation for the %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Fix default path for fitPlugins
 sed -i 's\/usr/lib/%{name}/plugins\%{_libdir}/%{name}/plugins\g' \
@@ -70,15 +74,9 @@ sed -i '/QTI_ROOT\/3rdparty/d' build.conf.example
 sed -i '/manual.path = /d' %{name}/%{name}.pro
 sed -i '/documentation.path = /d' %{name}/%{name}.pro
 sed -i '/pythonconfig.path = /d' %{name}/%{name}.pro
-sed -i '/3rdparty\/QTeXEngine/d' %{name}/%{name}.pro
 sed -i '/\/libEMF/d' %{name}/%{name}.pro
-sed -i '/3rdparty\/liborigin/d' %{name}/%{name}.pro
 sed -i '/3rdparty\/liborigin/d' %{name}/src/origin/origin.pri
 
-# Remove bundled libs
-rm -r 3rdparty/liborigin 3rdparty/QTeXEngine
-rm -f 3rdparty/zlib/*.h
-
 # Fix docbook path to for fedora < 14
 %if 0%{?fedora} > 13 
 %else
@@ -87,20 +85,12 @@ s/\./\\\./g"`/" manual/docbook-en/index.docbook
 %endif
 
 # Remove DOS line endings
-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 %{name}/*.txt
-dos2unix -k %{name}/*.py
-dos2unix -k manual/html/%{name}*
+sed -i 's/\r//' %{name}/*.txt
+sed -i 's/\r//' %{name}/*.py
+sed -i 's/\r//' manual/html/%{name}.*
 
 # Remove exec permission
-find -type d -exec chmod 0755 {} ";"
 find -type f -exec chmod 0644 {} ";"
 
 %build
@@ -108,17 +98,19 @@ cp -p build.conf.example build.conf
 export PATH=%{_qt4_bindir}:$PATH
 %{_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 \
-	EMF_ENGINE_LIBS=-lEmfEngine \
 	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" \
+	BOOST_LIBS="-lz -lorigin2" \
+	LIBORIGIN_INCLUDEPATH=%{_includedir}/liborigin2 LIBORIGIN_LIBS=-lorigin2 \
+	QUAZIP_INCLUDEPATH="%{_includedir}/minizip %{_includedir}/quazip" QUAZIP_LIBS=-lquazip \
+	LIBPNG_LIBS=-lpng \
+	EMF_ENGINE_INCLUDEPATH=%{_includedir}/libEMF EMF_ENGINE_LIBS=-lEmfEngine \
+	TEX_ENGINE_LIBS=-lQTeXEngine \
+	CONFIG+=CustomInstall \
+	DEFINES+=QTIPLOT_PRO \
 	%if %{_lib}==lib64	
 	libsuff=64 \
 	%endif
-	INCLUDEPATH+=" %{_includedir}/minizip %{_includedir}/liborigin2 %{_includedir}/libEMF" \
 	manual.path=%{_docdir}/%{name}-%{version}/manual documentation.path=%{_docdir}/%{name}-%{version} \
 	pythonconfig.path=%{_datadir}/%{name}
 
@@ -203,8 +195,8 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}-%{version}/manual
 
 %changelog
-* Wed Sep 29 2010 jkeating - 0.9.8.2-2
-- Rebuilt for gcc bug 634757
+* Wed Oct 13 2010 Chen Lei <supercyper@163.com> - 0.9.8.3-1
+- upstream to 0.9.8.3
 
 * Fri Sep 03 2010 Chen Lei <supercyper@163.com> - 0.9.8.2-1
 - upstream to 0.9.8.2
@@ -220,35 +212,4 @@ rm -rf %{buildroot}
 
 * Wed Jun 30 2010 Chen Lei <supercyper@163.com> - 0.9.8-1
 - upstream to 0.9.8
-- remove some patches 
-
-* Thu Apr 22 2010 Chen Lei <supercyper@163.com> - 0.9.7.14-1
-- upstream to 0.9.7.14
-
-* Thu Mar 18 2010 Chen Lei <supercyper@163.com> - 0.9.7.13-1
-- upstream to 0.9.7.13
-- remove ldconfig in scripts
-- add mimetype icons
-
-* Tue Feb 09 2010 Chen Lei <supercyper@163.com> - 0.9.7.12-1
-- upstream to 0.9.7.12
-- rename all patches
-
-* Sat Feb 06 2010 Frank Büttner <frank-buettner@gmx.net> - 0.9.7.11-5
-- add mising file to mock
-
-* Wed Feb  3 2010 Chen Lei <supercyper@163.com> - 0.9.7.11-4
-- enable importing of ODF spreadsheet files
-
-* Fri Jan 29 2010 Chen Lei <supercyper@163.com> - 0.9.7.11-3
-- fixed desktop mime field
-
-* Fri Jan 29 2010 Chen Lei <supercyper@163.com> - 0.9.7.11-2
-- add mime-info
-
-* Sat Jan 23 2010 Chen Lei <supercyper@163.com> - 0.9.7.11-1
-- upstream to 0.9.7.11
-
-* Sat Jan 10 2009 Frank Büttner <frank-buettner@gmx.net> - 0.9.7.4-8
-- fix dos2unix
-
+- remove some patches
diff --git a/sources b/sources
index 4758f9a..486d677 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+317f45128eef208b2d6b9c28a2e3fa6e  qtiplot-0.9.8.3.tar.bz2
 14e213a6fbbcce5824340768be528361  colormaps.tgz
-e8335a8760e8c2ac044607d5a4bb80ca  qtiplot-0.9.8.2.tar.bz2