[mMass] Lipid Maps database update.

[Antonio Trande]

commit 1dcdb67867fbbb473bfb5ee01a62dc2e25a13857
Author: sagitter <sagitter at fedoraproject.org>
Date:   Tue Nov 19 22:25:04 2013 +0100

    Lipid Maps database update.

 mMass.desktop |    9 +++++++++
 mMass.spec    |   36 ++++++++++++++++++++++++++++++------
 sources       |    2 +-
 3 files changed, 40 insertions(+), 7 deletions(-)
---
diff --git a/mMass.desktop b/mMass.desktop
new file mode 100644
index 0000000..4b163b2
--- /dev/null
+++ b/mMass.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=mMass
+GenericName=mMass
+Exec=mmass
+Icon=/usr/lib64/mMass/gui/images/gtk/icon_about.png
+Terminal=false
+Type=Application
+Categories=Application;Science;X-Accessories;
+
diff --git a/mMass.spec b/mMass.spec
index cab78f4..f467b8d 100644
--- a/mMass.spec
+++ b/mMass.spec
@@ -1,10 +1,11 @@
 Name: mMass
 Summary: Open Source Mass Spectrometry Tool
 Version: 5.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
+Group:   Applications/Engineering
 URL: http://www.mmass.org/
-Source0: http://www.mmass.org/download/files/v5.5.0/mmass_v5.5.0_source.zip
+Source0: http://www.mmass.org/download/files/v%{version}/mmass_v%{version}_source.zip
 
 ## Database links
 Source1: http://www.mmass.org/download/files/compounds/compounds_lipidmaps.zip
@@ -16,7 +17,9 @@ Source4: http://www.mmass.org/download/files/examples/examples_general.zip
 Source5: http://www.mmass.org/download/files/examples/examples_hdx.zip
 Source6: http://www.mmass.org/download/files/examples/examples_cpeptides.zip
 
-BuildRequires: python2-devel 
+Source7: %{name}.desktop
+
+BuildRequires: python2-devel, desktop-file-utils 
 BuildRequires: python-libs
 BuildRequires: wxPython-devel, numpy
 BuildRequires: dos2unix
@@ -26,12 +29,19 @@ Open Source Mass Spectrometry Tool
 
 %package examples
 Summary: %{name} examples
-Group: Development/Libraries
+Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 %description examples
 %{name} examples data.
 
+%package doc
+Summary: %{name} documentation
+Group: Applications/Engineering
+BuildArch: noarch
+%description doc
+%{name} PDF User Guide.
+
 %prep
 %setup -q -n %{name}
 mv readme.txt README.txt
@@ -48,7 +58,7 @@ sed -i -e '1i#!/usr/bin/python' mspy/*.py
 
 ## Unpacking zipped databases 
 unzip %{SOURCE1}
-mv readme.txt lipidmaps-readme.txt
+mv LIPIDMAPS/readme.txt LIPIDMAPS/lipidmaps-readme.txt
 rm -rf  __MACOSX
 
 unzip %{SOURCE2} 
@@ -85,6 +95,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/configs
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/database
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/mspy
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/gui/images/gtk
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -103,6 +114,10 @@ install -p -m 755 mmass.py* $RPM_BUILD_ROOT%{_libdir}/%{name}
 install -p -m 644 *.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/database
 install -p -m 644 General*Examples/*.msd HDX*Examples/*.msd Cyclic*Peptide*Examples/*.msd $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
 
+desktop-file-install                           \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+%{SOURCE7}
+
 ## Making binary file to start mMass
 
 cat <<EOF > mmass
@@ -121,7 +136,7 @@ install -m 755 mmass $RPM_BUILD_ROOT%{_bindir}
 sed -i -e '1i#!/usr/bin/python' $RPM_BUILD_ROOT%{_libdir}/%{name}/mmass.py
 
 %files
-%doc license.txt README.txt *.pdf *-readme.txt
+%doc license.txt README.txt *-readme.txt
 %{_bindir}/mmass
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mmass.py*
@@ -134,12 +149,21 @@ sed -i -e '1i#!/usr/bin/python' $RPM_BUILD_ROOT%{_libdir}/%{name}/mmass.py
 %{_libdir}/%{name}/gui/*
 %{python_sitearch}/*.egg-info
 %{_datadir}/%{name}/database/
+%{_datadir}/applications/*.desktop 
 
 %files examples
 %{_datadir}/%{name}/examples/
 
+%files doc
+%doc *Guide.pdf license.txt 
+
 
 %changelog
+* Tue Nov 19 2013 Antonio Trande <sagitter at fedoraproject.org> 5.5.0-5
+- Update LIPID MAPS Database (November 16, 2013)
+- User Guide packaged in the .doc subpackage
+- Installed new .desktop file
+
 * Tue Sep 17 2013 Antonio Trande <sagitter at fedoraproject.org> 5.5.0-4
 - Fixed shebang and wrong-script-end-of-line-encoding  errors
 - Added BR dos2unix
diff --git a/sources b/sources
index 277ea69..83a04e3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 b27b60e94d1a7e54d3007c7170c9f9eb  compounds_fungal_peptides.zip
-c058119836930e4e0fcfb1c2de97db89  compounds_lipidmaps.zip
+7d87e341a72a0cbf36400ce68d4bb43e  compounds_lipidmaps.zip
 f89a01f951afad22a92fa2594e6bb79d  compounds_norine.zip
 c49cc9826cd25fd8e61b4060f876de3c  examples_cpeptides.zip
 5f78072b91b0d4d2af4b9cdee270e86b  examples_general.zip