[qtiplot] Update to 0.9.8.2
Chen Lei
supercyper at fedoraproject.org
Sat Sep 11 04:17:28 UTC 2010
commit 731e205d6a61d2c73fef4d93f27721f260e2089e
Author: Chen Lei <supercyper at 163.com>
Date: Sat Sep 11 12:17:00 2010 +0800
Update to 0.9.8.2
.gitignore | 2 +-
qtiplot.spec | 50 ++++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 427e73b..2eddd13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/qtiplot-0.9.8.1.tar.bz2
/colormaps.tgz
+/qtiplot-0.9.8.2.tar.bz2
diff --git a/qtiplot.spec b/qtiplot.spec
index d6941c9..840e67d 100644
--- a/qtiplot.spec
+++ b/qtiplot.spec
@@ -1,6 +1,6 @@
Name: qtiplot
Summary: Data Analysis and Scientific Plotting Software
-Version: 0.9.8.1
+Version: 0.9.8.2
Release: 1%{?dist}
URL: http://soft.proindependent.com/qtiplot.html
License: GPLv2+
@@ -9,21 +9,21 @@ 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: 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: QTeXEngine-devel
BuildRequires: PyQt4-devel
# sip-devel comes with PyQt4-devel
BuildRequires: libpng-devel
-#BuildRequires: EmfEngine-devel
+BuildRequires: EmfEngine-devel
BuildRequires: quazip-devel
BuildRequires: liborigin2-devel >= 06042009-4.20100629svn
BuildRequires: docbook-utils
@@ -49,6 +49,7 @@ contributions are most welcome!
%package doc
Summary: Documentation for %{name}
Group: Documentation
+License: GFDL
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
@@ -60,7 +61,11 @@ The %{name}-doc package contains documentation for the %{name}.
%patch0 -p1
%patch1 -p1
-# remove redundant variables
+# Fix default path for fitPlugins
+sed -i 's\/usr/lib/%{name}/plugins\%{_libdir}/%{name}/plugins\g' \
+ %{name}/src/core/ApplicationWindow.cpp
+
+# Remove redundant variables
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
@@ -70,25 +75,18 @@ 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
+# Remove bundled libs
rm -r 3rdparty/liborigin 3rdparty/QTeXEngine
rm -f 3rdparty/zlib/*.h
-# fix docbook to for fedora < 14
+# Fix docbook path 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/%{name}/plugins\%{_libdir}/%{name}/plugins\g' \
- %{name}/src/core/ApplicationWindow.cpp
-
-find -type d -exec chmod 0755 {} ";"
-find -type f -exec chmod 0644 {} ";"
-
-# fix wrong-file-end-of-line-encoding
+# Remove DOS line endings
find -name '*.h' -exec dos2unix -k {} ";"
find -name '*.hh' -exec dos2unix -k {} ";"
find -name '*.hpp' -exec dos2unix -k {} ";"
@@ -101,6 +99,10 @@ dos2unix -k %{name}/*.txt
dos2unix -k %{name}/*.py
dos2unix -k manual/html/%{name}*
+# Remove exec permission
+find -type d -exec chmod 0755 {} ";"
+find -type f -exec chmod 0644 {} ";"
+
%build
cp -p build.conf.example build.conf
export PATH=%{_qt4_bindir}:$PATH
@@ -109,13 +111,14 @@ export PATH=%{_qt4_bindir}:$PATH
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" \
%if %{_lib}==lib64
libsuff=64 \
%endif
- INCLUDEPATH+=" %{_includedir}/minizip %{_includedir}/QTeXEngine %{_includedir}/liborigin2" \
+ INCLUDEPATH+=" %{_includedir}/minizip %{_includedir}/liborigin2 %{_includedir}/libEMF" \
manual.path=%{_docdir}/%{name}-%{version}/manual documentation.path=%{_docdir}/%{name}-%{version} \
pythonconfig.path=%{_datadir}/%{name}
@@ -128,14 +131,14 @@ make %{?_smp_mflags}
%install
make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
-# remove local copy qwt/qwtplot3d
+# Remove local copy qwt/qwtplot3d
rm -r %{buildroot}%{_prefix}/local
rm -r %{buildroot}%{_builddir}
-# remove symlinks
+# Remove symlinks
find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} ";"
-# fix wrong manual path(important!!!)
+# Fix wrong manual path(important!!!)
mv %{buildroot}%{_docdir}/%{name}-%{version}/manual/html/* \
%{buildroot}%{_docdir}/%{name}-%{version}/manual
rmdir %{buildroot}%{_docdir}/%{name}-%{version}/manual/html
@@ -145,7 +148,7 @@ tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/%{name}
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-# 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 \
@@ -153,7 +156,7 @@ install -cpm 0644 %{name}_logo.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
@@ -200,6 +203,9 @@ rm -rf %{buildroot}
%{_docdir}/%{name}-%{version}/manual
%changelog
+* Fri Sep 03 2010 Chen Lei <supercyper at 163.com> - 0.9.8.2-1
+- upstream to 0.9.8.2
+
* Fri Aug 27 2010 Chen Lei <supercyper at 163.com> - 0.9.8.1-1
- upstream to 0.9.8.1
diff --git a/sources b/sources
index 79370b1..4758f9a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
14e213a6fbbcce5824340768be528361 colormaps.tgz
-5f4712d253c9b1eeeb397832be1d2fd7 qtiplot-0.9.8.1.tar.bz2
+e8335a8760e8c2ac044607d5a4bb80ca qtiplot-0.9.8.2.tar.bz2
More information about the scm-commits
mailing list