rpms/qtiplot/devel qtiplot.spec,1.18,1.19

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10499

Modified Files:
	qtiplot.spec 
Log Message:
enable importing of ODF spreadsheet files



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- qtiplot.spec	29 Jan 2010 08:19:07 -0000	1.18
+++ qtiplot.spec	3 Feb 2010 05:48:20 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.11
-Release:	3%{?dist}
+Release:	4%{?dist}
 BuildRequires:	qt4-devel
 BuildRequires:	liborigin2-devel
 BuildRequires:	QTeXEngine-devel
@@ -12,7 +12,7 @@ BuildRequires:	boost-devel
 #BuildRequires:	qwt-devel
 #BuildRequires:	qwtplot3d-qt4-devel
 #BuildRequires:	libxls-devel
-#BuildRequires:	quazip-devel
+BuildRequires:	quazip-devel
 BuildRequires:	libpng-devel
 #python-devel comes with sip-devel
 #BuildRequires:	python-devel
@@ -48,7 +48,9 @@ Patch5:		5-liborigin2.patch
 Patch6:		6-QTeXEngine.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):		shared-mime-info
+Requires(post):		desktop-file-utils 
 Requires(postun):	shared-mime-info
+Requires(postun):	desktop-file-utils
 
 %description
 Scientists often need to use data analysis and plotting software.
@@ -80,8 +82,8 @@ The %{name}-doc package contains documen
 #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/docbook-dtds-//" |sed \
-	"s/\.noarch//"|sed "s/\./\\\./g"`/" manual/docbook-en/index.docbook 
+sed -i "s/VER-REL/`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
+s/\./\\\./g"`/" manual/docbook-en/index.docbook 
 #fix default path for fitPlugins
 sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}/plugins\g" \
 	qtiplot/src/core/ApplicationWindow.cpp
@@ -133,15 +135,15 @@ install -m 0644 -p %{SOURCE3} %{buildroo
 
 %post
 umask 022
-update-desktop-database -q 
-/sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+/sbin/ldconfig
 
 %postun
 umask 022
-update-desktop-database -q 
-/sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+/sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
@@ -168,12 +170,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb  3 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-4
+ - enable importing of ODF spreadsheet files
+
 * Fri Jan 29 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-3
  - fixed desktop mime field
+
 * Fri Jan 29 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-2
  - add mime-info
+
 * Sat Jan 23 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-1
  - upstream to 0.9.7.11
+
 * Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-8
  - fix dos2unix