[mathomatic/f13/master: 6/6] Merge branch 'master' into f13

[terjeros]

commit ced4defbfd3be33b09c667d05f5c9472e53a5f5b
Merge: 85047ee 04d00b4
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Fri Nov 5 18:19:18 2010 +0100

    Merge branch 'master' into f13

 .gitignore      |    2 ++
 mathomatic.spec |   23 ++++++++++++++++++-----
 sources         |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --cc mathomatic.spec
index d4dd1b2,bd50afb..66d88b3
--- a/mathomatic.spec
+++ b/mathomatic.spec
@@@ -44,15 -44,17 +44,22 @@@ pushd prime
  desktop-file-install --delete-original \
      --dir %{buildroot}%{_datadir}/applications  \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
- 
  pushd primes
  %{__make} install prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir}
+ convert  %{buildroot}%{_datadir}/pixmaps/%{name}.xpm \
+          %{buildroot}%{_datadir}/pixmaps/%{name}.png
+ %{__rm} -f %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+ 
+ %check
+ %{__make} test
+ pushd primes
+ %{__make} test
  
 +%check
 +%{__make} test
 +pushd primes
 +%{__make} test
 +
  %clean
  %{__rm} -rf %{buildroot}