[veusz/f15/master] Update to Veusz 1.11 and run self test

[Jeremy Sanders]

commit aad90757cbaa9a7aee14faab56f23b045a50a030
Author: Jeremy Sanders <jeremy at jeremysanders.net>
Date:   Mon Apr 4 21:52:26 2011 +0100

    Update to Veusz 1.11 and run self test

 .gitignore |    1 +
 sources    |    2 +-
 veusz.spec |   31 +++++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1529be..f1849bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ veusz-1.7.tar.gz
 veusz-1.8.tar.gz
 /veusz-1.9.tar.gz
 /veusz-1.10.tar.gz
+/veusz-1.11.tar.gz
diff --git a/sources b/sources
index 55bf14d..0bf7591 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-164caf9a535afd92133515a251bb41eb  veusz-1.10.tar.gz
+0b96e7eb8f8049b2d45d49c86dfb5b21  veusz-1.11.tar.gz
diff --git a/veusz.spec b/veusz.spec
index c20b4e8..0dc167c 100644
--- a/veusz.spec
+++ b/veusz.spec
@@ -3,7 +3,7 @@
 %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
 
 Name:           veusz
-Version:        1.10
+Version:        1.11
 Release:        2%{?dist}
 Summary:        GUI scientific plotting package
 
@@ -19,11 +19,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel desktop-file-utils numpy
 BuildRequires:  PyQt4-devel qt-devel sip-devel
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
+BuildRequires:  xorg-x11-server-Xvfb xorg-x11-xauth
 
 Requires:       numpy PyQt4 /usr/bin/env
 Provides:       python-veusz
-Requires(post): shared-mime-info desktop-file-utils
-Requires(postun): shared-mime-info desktop-file-utils
 
 # for eggs
 %if 0%{?fedora} >= 8
@@ -93,13 +92,19 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -p Documents/veusz.1 Documents/veusz_listen.1 -m 0644 \
         ${RPM_BUILD_ROOT}%{_mandir}/man1
 
+%check
+# self test has to run in X environment
+PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitearch} xvfb-run \
+        --server-args "-screen 0 640x480x24" \
+        python tests/runselftest.py
+
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications
+update-desktop-database &> /dev/null || :
 
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications
+update-desktop-database &> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/mime/packages/veusz.xml
 %dir %{python_sitearch}/veusz
-%{python_sitearch}/*
+%{python_sitearch}/veusz-*egg-info
 %{python_sitearch}/veusz/VERSION
 %{python_sitearch}/veusz/*.py
 %{python_sitearch}/veusz/*.py[co]
@@ -127,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/veusz/helpers/*.py
 %{python_sitearch}/veusz/helpers/*.py[co]
 %{python_sitearch}/veusz/helpers/*.so
+%{python_sitearch}/veusz/plugins/*.py
+%{python_sitearch}/veusz/plugins/*.py[co]
+%{python_sitearch}/veusz/qtwidgets/*.py
+%{python_sitearch}/veusz/qtwidgets/*.py[co]
 %{python_sitearch}/veusz/setting/*.py
 %{python_sitearch}/veusz/setting/*.py[co]
 %{python_sitearch}/veusz/utils/*.py
@@ -143,6 +152,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 04 2011 Jeremy Sanders <jeremy at jeremysanders.net> - 1.10-2
+- Run self test after build
+- Remove duplicate file statements
+
+* Mon Apr 04 2011 Jeremy Sanders <jeremy at jeremysanders.net> - 1.10-1
+- Update to Veusz 1.11
+
+* Tue Mar 22 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.10-3
+- fix scriptlet usage
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild