[gnofract4d] Simplify Xvfb usage. Add an AppData file.

[Jerry James]

commit b0524b8b141ca4242ea6b41392f2f26c8978e9c5
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu Feb 27 16:27:23 2014 -0700

    Simplify Xvfb usage.
    Add an AppData file.

 gnofract4d.appdata.xml |   28 ++++++++++++++++++++++++++++
 gnofract4d.spec        |   15 ++++++++++++---
 2 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/gnofract4d.appdata.xml b/gnofract4d.appdata.xml
new file mode 100644
index 0000000..60406ca
--- /dev/null
+++ b/gnofract4d.appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">gnofract4d.desktop</id>
+ <licence>CC0</licence>
+ <description>
+  <p>
+   Gnofract 4D is a free, open source program which allows anyone to create
+   beautiful images called fractals.
+  </p>
+  <p>The fractals are automatically created by the computer based on
+   mathematical principles.  These include the Mandelbrot and Julia sets and
+   many more.  You don't need to do any math: you can explore a universe of
+   images just using a mouse.
+  </p>
+ </description>
+ <screenshots>
+  <screenshot type="default">http://gnofract4d.sourceforge.net/images/screenshot.png</screenshot>
+  <screenshot>http://gnofract4d.sourceforge.net/images/screenshot2.png</screenshot>
+  <screenshot>http://gnofract4d.sourceforge.net/images/screenshot3.png</screenshot>
+  <screenshot>http://gnofract4d.sourceforge.net/images/screenshot4.png</screenshot>
+  <screenshot>http://gnofract4d.sourceforge.net/images/screenshot5.png</screenshot>
+  <screenshot>http://gnofract4d.sourceforge.net/images/screenshot6.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://gnofract4d.sourceforge.net/</url>
+ <!-- FIXME: change this to an upstream email address for spec updates
+         <updatecontact>someone_who_cares at upstream_project.org</updatecontact>
+  -->
+</application>
diff --git a/gnofract4d.spec b/gnofract4d.spec
index 948066a..e216608 100644
--- a/gnofract4d.spec
+++ b/gnofract4d.spec
@@ -1,11 +1,12 @@
 Name:           gnofract4d
 Version:        3.14.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gnofract 4D is a Gnome-based program to draw fractals
 Group:          Amusements/Graphics
 License:        LGPLv2+
 URL:            http://gnofract4d.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:        %{name}.appdata.xml
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
@@ -16,7 +17,6 @@ BuildRequires:  libxslt
 BuildRequires:  pygtk2-devel
 BuildRequires:  xorg-x11-fonts-Type1
 BuildRequires:  xorg-x11-server-Xvfb
-BuildRequires:  xorg-x11-xinit
 
 Requires:       gcc
 Requires:       libgcc%{?_isa}
@@ -55,7 +55,7 @@ python2 setup.py build
 # Generate documentation with an X server running (on a random X server to
 # avoid collisions) so pygtk doesn't bail out immediately.
 let "dnum = $RANDOM % 90 + 10"
-xinit %{__python} createdocs.py -- /usr/bin/Xvfb :$dnum -ac
+xvfb-run -n $dnum %{__python2} createdocs.py
 
 %install
 python2 setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
@@ -63,6 +63,10 @@ python2 setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Check the desktop file
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# Install the AppData file
+mkdir -p %{buildroot}%{_datadir}/appdata
+install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata
+
 # Remove the shebangs
 for fil in `find $RPM_BUILD_ROOT%{python2_sitearch} -perm 644 -name '*.py'`; do
   sed '\|^#!/usr/bin.*python|d' $fil > $fil.new
@@ -99,6 +103,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/mime/packages/%{name}-mime.xml
@@ -110,6 +115,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{python2_sitearch}/fractutils/
 
 %changelog
+* Thu Feb 27 2014 Jerry James <loganjerry at gmail.com> - 3.14.1-4
+- Simplify Xvfb usage
+- Add an AppData file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.14.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild