[OpenLP/f15] Release 1.9.6 - Beta 2

[Tim Bentley]

commit b3226c10f79090da6040bc9fef5b8e7a090a6281
Author: Tim Bentley <Tim.Bentley at gmail.com>
Date:   Sat Jun 25 08:15:30 2011 +0100

    Release 1.9.6 - Beta 2

 .gitignore  |    1 +
 OpenLP.spec |   19 +++++++++++++++----
 sources     |    2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 702c718..3a98cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ OpenLP-1.9.2.1.tar.gz
 /OpenLP-1.9.3.tar.gz
 /OpenLP-1.9.4.tar.gz
 /OpenLP-1.9.5.tar.gz
+/OpenLP-1.9.6.tar.gz
diff --git a/OpenLP.spec b/OpenLP.spec
index ffa27b3..fb65ffc 100644
--- a/OpenLP.spec
+++ b/OpenLP.spec
@@ -2,8 +2,8 @@
 
 Summary: Open source Church presentation and lyrics projection application
 Name: OpenLP
-Version: 1.9.5
-Release: 3%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/openlp/openlp/%{version}/%{name}-%{version}.tar.gz
 License: GPLv2
 Group: Applications/Multimedia
@@ -23,6 +23,8 @@ Requires:       python-chardet
 Requires:       python-lxml
 Requires:       python-sqlalchemy
 Requires:       python-enchant
+Requires:       python-mako
+Requires:       python-openoffice
 Requires:       hicolor-icon-theme
 Requires:       libreoffice-graphicfilter
 Requires:       libreoffice-impress
@@ -31,7 +33,7 @@ Requires:       libreoffice-headless
 %description
 OpenLP is a church presentation software, for lyrics projection software,
 used to display slides of Songs, Bible verses, videos, images, and
-presentations via libreoffice using a computer and projector.
+presentations via LibreOffice using a computer and projector.
 
 %prep
 %setup -q
@@ -56,19 +58,25 @@ desktop-file-install \
   --dir %{buildroot}/%{_datadir}/applications \
   resources/openlp.desktop
 
+desktop-file-validate %{buildroot}/%{_datadir}/applications/openlp.desktop
+
 mv %{buildroot}%{_bindir}/openlp.pyw %{buildroot}%{_bindir}/openlp
 
 mkdir -p %{buildroot}%{_datadir}/openlp/i18n/
 mv resources/i18n/*.qm %{buildroot}%{_datadir}/openlp/i18n
+mkdir -p %{buildroot}%{_datadir}/mime/packages
+cp -p resources/openlp.xml %{buildroot}%{_datadir}/mime/packages
 
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null ||:
 update-desktop-database &> /dev/null ||:
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null ||:
 update-desktop-database &> /dev/null ||:
 
 %clean
@@ -78,14 +86,17 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc copyright.txt LICENSE
 %{_bindir}/openlp
+%{_datadir}/mime/packages/openlp.xml
 %{_datadir}/applications/openlp.desktop
 %{_datadir}/icons/hicolor/*/apps/openlp.*
 %{_datadir}/openlp
 %{python_sitelib}/openlp/
 %{python_sitelib}/OpenLP-%{version}*.egg-info
-%doc documentation/*.txt
 
 %changelog
+* Sat Jun 25 2011 Tim Bentley <timbentley at openlp.org> - 1.9.6-1
+- Release build for beta 2
+
 * Mon May 23 2011 Tim Bentley <timbentley at openlp.org> - 1.9.5-3
 - Fix dependancy error
 
diff --git a/sources b/sources
index 7328dc6..9db8cab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5108a27493252bc73d7c7f782de52da  OpenLP-1.9.5.tar.gz
+7515e6e7ef4c05d5fbbef180eb39c5ae  OpenLP-1.9.6.tar.gz