[qtiplot: 25/25] Update to 0.9.8.1
Chen Lei
supercyper at fedoraproject.org
Fri Aug 27 02:05:00 UTC 2010
commit fe38734363b6d1f7bb5a772292f5eef35d88797f
Author: Chen Lei <supercyper at 163.com>
Date: Fri Aug 27 10:04:15 2010 +0800
Update to 0.9.8.1
.gitignore | 4 +-
qtiplot.spec | 111 ++++++++++++++++++++++++++++++++-------------------------
sources | 4 +-
3 files changed, 66 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 161044e..427e73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-colormaps.tgz
-qtiplot-0.9.8.tar.bz2
+/qtiplot-0.9.8.1.tar.bz2
+/colormaps.tgz
diff --git a/qtiplot.spec b/qtiplot.spec
index 47ad405..d6941c9 100644
--- a/qtiplot.spec
+++ b/qtiplot.spec
@@ -1,7 +1,7 @@
Name: qtiplot
-Summary: Data Analysis and Scientific Plotting
-Version: 0.9.8
-Release: 3%{?dist}
+Summary: Data Analysis and Scientific Plotting Software
+Version: 0.9.8.1
+Release: 1%{?dist}
URL: http://soft.proindependent.com/qtiplot.html
License: GPLv2+
Group: Applications/Engineering
@@ -9,23 +9,23 @@ Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
Source1: http://soft.proindependent.com/misc/colormaps.tgz
Source2: %{name}.desktop
Source3: %{name}.xml
-#fix manual building
+# fix manual building
Patch0: %{name}-0.9.8-manual.patch
-#disable choosing of help folder at runtime
+# disable choosing of help folder at runtime
Patch1: %{name}-0.9.8-manualpath.patch
BuildRequires: qt-assistant-adp-devel
-BuildRequires: liborigin2-devel >= 06042009-4.20100629svn
-BuildRequires: QTeXEngine-devel
BuildRequires: muParser-devel >= 1.32
BuildRequires: gsl-devel
-#use local copy till upstream catches up
+# use local copy till upstream catches up
#BuildRequires: qwt-devel
#BuildRequires: qwtplot3d-qt4-devel
-BuildRequires: quazip-devel
-BuildRequires: libpng-devel
+BuildRequires: QTeXEngine-devel
BuildRequires: PyQt4-devel
-#sip-devel comes with PyQt4-devel
-#BuildRequires: sip-devel
+# sip-devel comes with PyQt4-devel
+BuildRequires: libpng-devel
+#BuildRequires: EmfEngine-devel
+BuildRequires: quazip-devel
+BuildRequires: liborigin2-devel >= 06042009-4.20100629svn
BuildRequires: docbook-utils
BuildRequires: docbook-style-xsl
BuildRequires: dblatex
@@ -37,11 +37,14 @@ Requires: hicolor-icon-theme
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
-Scientists often need to use data analysis and plotting software.
-For Windows 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.
+Scientists often need to use data analysis and plotting software. For Windows
+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
+actively improved, all your suggestions to our "wish to" list and all your
+contributions are most welcome!
%package doc
Summary: Documentation for %{name}
@@ -57,40 +60,41 @@ The %{name}-doc package contains documentation for the %{name}.
%patch0 -p1
%patch1 -p1
-#remove redundant variables
+# remove redundant variables
sed -i '/QTI_ROOT\/3rdparty/d' build.conf.example
sed -i '/manual.path = /d' %{name}/%{name}.pro
-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 liborigin2 and QTeXEngine
+# remove bundled libs
rm -r 3rdparty/liborigin 3rdparty/QTeXEngine
+rm -f 3rdparty/zlib/*.h
-#fix docbook to for fedora < 14
+# 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
+# fix default path for fitPlugins
sed -i 's\/usr/lib/%{name}/plugins\%{_libdir}/%{name}/plugins\g' \
%{name}/src/core/ApplicationWindow.cpp
-find -type d -exec chmod 0755 {} \;
-find -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 {} \;
+# 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 %{name}/*.txt
@@ -123,30 +127,36 @@ make %{?_smp_mflags}
%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
+
+# remove local copy qwt/qwtplot3d
+rm -r %{buildroot}%{_prefix}/local
+rm -r %{buildroot}%{_builddir}
+
+# remove symlinks
+find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} ";"
+
+# 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/qwtplot3d
-rm -rf %{buildroot}%{_prefix}/local
-rm -rf %{buildroot}%{_builddir}
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
+
mkdir -p %{buildroot}%{_datadir}/%{name}
tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/%{name}
+desktop-file-install \
+ --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-#remove symlinks
-find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} \;
-
-#add icon
+# add icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
install -cpm 0644 %{name}_logo.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
install -cpm 0644 %{name}_logo.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-%{name}-project.png
-#add mimeinfo
+
+# add mimeinfo
mkdir -p %{buildroot}%{_datadir}/mime/packages
install -cpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+
%find_lang %{name} --with-qt --without-mo
%post
@@ -170,19 +180,19 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%{_libdir}/%{name}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/translations
+%dir %{_docdir}/%{name}-%{version}
+%{_bindir}/%{name}
+%{_libdir}/%{name}
%{_datadir}/%{name}/colormaps
%{_datadir}/%{name}/qti*
-%{_docdir}/%{name}-%{version}/README.html
-%{_docdir}/%{name}-%{version}/gpl_licence.txt
-%{_bindir}/%{name}
%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/mime/packages/*
+%{_docdir}/%{name}-%{version}/README.html
+%{_docdir}/%{name}-%{version}/gpl_licence.txt
%{_mandir}/man1/%{name}.1*
%files doc
@@ -190,6 +200,9 @@ rm -rf %{buildroot}
%{_docdir}/%{name}-%{version}/manual
%changelog
+* Fri Aug 27 2010 Chen Lei <supercyper at 163.com> - 0.9.8.1-1
+- upstream to 0.9.8.1
+
* Tue Jul 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.9.8-3
- rebuild (python27)
diff --git a/sources b/sources
index c4b82ee..79370b1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-14e213a6fbbcce5824340768be528361 colormaps.tgz
-5cd4d9a07a960b1aedf33f45fee5e21f qtiplot-0.9.8.tar.bz2
+14e213a6fbbcce5824340768be528361 colormaps.tgz
+5f4712d253c9b1eeeb397832be1d2fd7 qtiplot-0.9.8.1.tar.bz2
More information about the scm-commits
mailing list