[why] Rebuild for ocamlgraph 1.8.4. Update desktop files. Add AppData files for gwhy and jessie.

[Jerry James]

commit 03ba744ac579e6c866fceedaa7f4842e0f9b8ca9
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Feb 26 10:47:08 2014 -0700

    Rebuild for ocamlgraph 1.8.4.
    Update desktop files.
    Add AppData files for gwhy and jessie.

 gwhy.appdata.xml   |   20 ++++++++++++++++++++
 gwhy.desktop       |    3 +--
 jessie.appdata.xml |   26 ++++++++++++++++++++++++++
 jessie.desktop     |    3 +--
 why.spec           |   15 ++++++++++++++-
 5 files changed, 62 insertions(+), 5 deletions(-)
---
diff --git a/gwhy.appdata.xml b/gwhy.appdata.xml
new file mode 100644
index 0000000..f9126b8
--- /dev/null
+++ b/gwhy.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">gwhy.desktop</id>
+ <licence>CC0</licence>
+ <description>
+  <p>
+   Gwhy is a graphical user interface for the Why software coordination
+   platform.  It assists in the coordination of dispatching assertions that
+   need to be proven to different theorem provers by providing an interface to
+   do this and also supports inspection of why input files.
+  </p>
+ </description>
+ <screenshots>
+  <screenshot type="default">http://why.lri.fr/manual/manual001.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://why.lri.fr/</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/gwhy.desktop b/gwhy.desktop
index 27f853a..0271742 100644
--- a/gwhy.desktop
+++ b/gwhy.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=gwhy
 Comment=Examine and develop Why .why files
 Exec=gwhy
 Icon=ICON-LOCATION-BASE/gwhy-icon.png
 Type=Application
-Categories=Development;
\ No newline at end of file
+Categories=Development;
diff --git a/jessie.appdata.xml b/jessie.appdata.xml
new file mode 100644
index 0000000..fc64aad
--- /dev/null
+++ b/jessie.appdata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">jessie.desktop</id>
+ <licence>CC0</licence>
+ <description>
+  <p>
+   Jessie is an interface between why and Frama-C.
+  </p>
+  <p>
+   Why is a software verification platform that applies formal proving tools to
+   annotated programs.  The Jessie plugin provide the ability to analyze C
+   programs by invoking Frama-C.
+  </p>
+ </description>
+ <screenshots>
+  <screenshot type="default">http://krakatoa.lri.fr/jessie/max_why3ide.png</screenshot>
+  <screenshot>http://krakatoa.lri.fr/jessie/max_ptr_why3ide.png</screenshot>
+  <screenshot>http://krakatoa.lri.fr/jessie/binary_search_raw.png</screenshot>
+  <screenshot>http://krakatoa.lri.fr/jessie/binary_search_ovfl.png</screenshot>
+  <screenshot>http://krakatoa.lri.fr/jessie/binary_search_behav.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://krakatoa.lri.fr/</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/jessie.desktop b/jessie.desktop
index 239f37a..f01c1d9 100644
--- a/jessie.desktop
+++ b/jessie.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=jessie
 Comment=Verify C program using Jessie plug-in
-Exec=frama-c -jessie %f
+Exec=frama-c -jessie %F
 Icon=ICON-LOCATION-BASE/gwhy-icon.png
 Type=Application
 Categories=Development;
diff --git a/why.spec b/why.spec
index 9ba9c80..59b1814 100644
--- a/why.spec
+++ b/why.spec
@@ -17,7 +17,7 @@
 
 Name:           why
 Version:        2.33
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Software verification platform
 
 Group:          Applications/Engineering
@@ -36,6 +36,8 @@ Source9:        jessie.desktop
 Source10:       div.pvs
 Source11:       rem.pvs
 Source12:       patch_jessie_pvs
+Source13:       gwhy.appdata.xml
+Source14:       jessie.appdata.xml
 
 # The gwhy execution shell script is not particularly informative
 # about when bad parameters are passed to it - this patch fixes that.
@@ -323,6 +325,10 @@ sed -e 's|ICON-LOCATION-BASE|%{why_data_dir}|' %{SOURCE9} > jessie.desktop
 desktop-file-install  \
  --dir=%{buildroot}%{_datadir}/applications jessie.desktop
 
+# Install AppData files
+mkdir -p %{buildroot}%{_datadir}/appdata
+install -pm 644 %{SOURCE13} %{SOURCE14} %{buildroot}%{_datadir}/appdata
+
 %if %{has_pvs}
 # Get rid of a BUILDROOT reference in a log file (fails QA_CHECK_RPATHS)
 sed -i "s|%{buildroot}||" %{buildroot}%{_libdir}/pvs/lib/why/top.out
@@ -401,12 +407,14 @@ diff -u min.why min_why.why.result  # Show differences from correct result.
 %{_bindir}/gwhy
 %{_bindir}/gwhy-bin
 %{why_data_dir}/
+%{_datadir}/appdata/gwhy.appdata.xml
 %{_datadir}/applications/gwhy.desktop
 
 %files jessie
 %{_bindir}/jessie
 %{_libdir}/jessie/
 %{_libdir}/frama-c/plugins/Jessie.*
+%{_datadir}/appdata/jessie.appdata.xml
 %{_datadir}/applications/jessie.desktop
 
 %if %{has_coq}
@@ -439,6 +447,11 @@ diff -u min.why min_why.why.result  # Show differences from correct result.
 
 
 %changelog
+* Wed Feb 26 2014 Jerry James <loganjerry at gmail.com> - 2.33-6
+- Rebuild for ocamlgraph 1.8.4
+- Update desktop files
+- Add AppData files for gwhy and jessie
+
 * Tue Sep 17 2013 Jerry James <loganjerry at gmail.com> - 2.33-5
 - Rebuild for OCaml 4.01.0
 - Enable debuginfo