[openscad] Enable Xvfb tests. Add AppData from upstream git

[Miro Hrončok]

commit 840c473e7f4d66e11c3f28148a8a0b9bb692b8d4
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Fri Dec 27 19:01:29 2013 +0100

    Enable Xvfb tests. Add AppData from upstream git

 openscad.appdata.xml |   16 ++++++++++++++++
 openscad.spec        |   40 +++++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/openscad.appdata.xml b/openscad.appdata.xml
new file mode 100644
index 0000000..0378d15
--- /dev/null
+++ b/openscad.appdata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">openscad.desktop</id>
+ <licence>CC0</licence>
+ <summary>The Programmers Solid 3D CAD Modeller</summary>
+ <description>
+  <p>OpenSCAD is a software for creating solid 3D CAD models. Unlike most free software for creating 3D models (such as Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.</p>
+  <p>OpenSCAD is not an interactive modeller. Instead it is something like a 3D-compiler that reads in a script file that describes the object and renders the 3D model from this script file. This gives you (the designer) full control over the modelling process and enables you to easily change any step in the modelling process or make designs that are defined by configurable parameters.</p>
+  <p>OpenSCAD provides two main modelling techniques: First there is constructive solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data exchange format format for this 2D outlines Autocad DXF files are used. In addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats.</p>
+ </description>
+ <screenshots>
+  <screenshot type="default" width="800" height="437">http://www.openscad.org/images/appdata-screenshot-1.png</screenshot>
+  <screenshot width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://www.openscad.org/</url>
+</application>
diff --git a/openscad.spec b/openscad.spec
index c07fd88..3c0c483 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -1,31 +1,37 @@
 Name:           openscad
 %global shortversion 2013.06
 Version:        %{shortversion}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Programmers Solid 3D CAD Modeller
 # COPYING contains a linking exception for CGAL
 License:        GPLv2 with exceptions
 Group:          Applications/Engineering
 URL:            http://www.openscad.org/
 Source0:        https://openscad.googlecode.com/files/%{name}-%{shortversion}.src.tar.gz
+Source1:        https://raw.github.com/%{name}/%{name}/107d19e93e9e12bfa3bf1d480b311ed718004b68/%{name}.appdata.xml
+
 Patch0:         %{name}-stdint.patch
 
 # https://github.com/openscad/openscad/commit/2e21f3deff585731d5377490cde87eeccd917445
 Patch482:       %{name}-482.patch
 
-BuildRequires:  qt-devel >= 4.4
+BuildRequires:  CGAL-devel >= 3.6
+BuildRequires:  ImageMagick
+BuildRequires:  Xvfb
 BuildRequires:  bison >= 2.4
-BuildRequires:  flex >= 2.5.35
-BuildRequires:  eigen2-devel >= 2.0.13
 BuildRequires:  boost-devel >= 1.3.5
-BuildRequires:  mpfr-devel >= 3.0.0
-BuildRequires:  gmp-devel >= 5.0.0
+BuildRequires:  desktop-file-utils
+BuildRequires:  eigen2-devel >= 2.0.13
+BuildRequires:  flex >= 2.5.35
 BuildRequires:  glew-devel >= 1.6
-BuildRequires:  CGAL-devel >= 3.6
+BuildRequires:  glib2-devel
+BuildRequires:  gmp-devel >= 5.0.0
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mpfr-devel >= 3.0.0
 BuildRequires:  opencsg-devel >= 1.3.2
-BuildRequires:  desktop-file-utils
-BuildRequires:  ImageMagick
+BuildRequires:  procps-ng
 BuildRequires:  python2
+BuildRequires:  qt-devel >= 4.4
 
 %description
 OpenSCAD is a software for creating solid 3D CAD objects.
@@ -53,10 +59,15 @@ cd -
 
 %install
 make install INSTALL_ROOT=%{buildroot}
+
 # manpage
 mkdir -p %{buildroot}%{_mandir}/man1
 cp doc/%{name}.1 %{buildroot}%{_mandir}/man1/
 
+# appdata
+mkdir -p %{buildroot}%{_datadir}/appdata
+cp %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
 # remove MCAD (separated package)
 rm -rf %{buildroot}%{_datadir}/%{name}/libraries/MCAD
 
@@ -66,11 +77,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 # tests
 cd tests
 ctest %{?_smp_mflags} -C All || : # let the tests fail, as they probably won't work in Koji
+cat sysinfo.txt || :
+cat Testing/Temporary/LastTest.log || :
 cd -
 
 %files
 %doc COPYING README.md RELEASE_NOTES
 %attr(755,root,root) %{_bindir}/%{name}
+%if 0%{?fedora} < 21
+%{_datadir}/appdata
+%else
+%{_datadir}/appdata/*.xml
+%endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_datadir}/%{name}
@@ -79,6 +97,10 @@ cd -
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.06-8
+- Enable Xvfb tests
+- Add AppData from upstream git
+
 * Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 2013.06-7
 - rebuilt for GLEW 1.10