[OpenLP/f21] 2.1.2 Beta 2 Release

[Tim Bentley]

commit f4dc5c70fdc623a14be271601909c5e700a06437
Author: Tim Bentley <Tim.Bentley at gmail.com>
Date:   Sun Jan 25 08:13:16 2015 +0000

    2.1.2 Beta 2 Release

 .gitignore  |    1 +
 OpenLP.spec |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 sources     |    2 +-
 3 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 574257c..4fcfc63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ OpenLP-1.9.2.1.tar.gz
 /OpenLP-2.0.3.tar.gz
 /OpenLP-2.0.4.tar.gz
 /OpenLP-2.0.5.tar.gz
+/OpenLP-2.1.2.tar.gz
diff --git a/OpenLP.spec b/OpenLP.spec
index f2cc8a0..ebc6ee4 100644
--- a/OpenLP.spec
+++ b/OpenLP.spec
@@ -1,8 +1,8 @@
-%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global modname 2.1.2
 
 Summary: Open source Church presentation and lyrics projection application
 Name: OpenLP
-Version: 2.0.5
+Version: 2.1.2
 Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/openlp/openlp/%{version}/%{name}-%{version}.tar.gz
 License: GPLv2
@@ -13,23 +13,23 @@ BuildArch: noarch
 URL: http://openlp.org/
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 
-Requires:       PyQt4
+Requires:       python3-PyQt4
 Requires:       phonon
-Requires:       python-BeautifulSoup
-Requires:       python-chardet
-Requires:       python-lxml
-Requires:       python-sqlalchemy
-Requires:       python-enchant
-Requires:       python-mako
-Requires:       python-openoffice
-Requires:       python-migrate
+Requires:       python3-beautifulsoup4
+Requires:       python3-chardet
+Requires:       python3-lxml
+Requires:       python3-sqlalchemy
+Requires:       python3-enchant
+Requires:       python3-mako
+Requires:       python3-openoffice
+Requires:       python3-alembic
 Requires:       hicolor-icon-theme
 Requires:       libreoffice-graphicfilter
 Requires:       libreoffice-impress
-Requires:       libreoffice-headless
+Requires:       mupdf
 
 %description
 OpenLP is a church presentation software, for lyrics projection software,
@@ -40,11 +40,11 @@ presentations via LibreOffice using a computer and projector.
 %setup -q
 
 %build
-python setup.py build
+%{__python3} setup.py build
 
 %install
 rm -rf %{buildroot}
-python setup.py install --skip-build -O1 --root %{buildroot}
+%{__python3} setup.py install --skip-build -O1 --root %{buildroot}
 
 install -m644 -p -D resources/images/openlp-logo-16x16.png \
    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/openlp.png
@@ -61,7 +61,7 @@ desktop-file-install \
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/openlp.desktop
 
-mv %{buildroot}%{_bindir}/openlp.pyw %{buildroot}%{_bindir}/openlp
+mv %{buildroot}%{_bindir}/openlp.py %{buildroot}%{_bindir}/openlp
 
 mkdir -p %{buildroot}%{_datadir}/openlp/i18n/
 mv resources/i18n/*.qm %{buildroot}%{_datadir}/openlp/i18n
@@ -70,16 +70,21 @@ 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 ||:
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 update-desktop-database &> /dev/null ||:
 
 %postun
+if [ $1 -eq 0 ]; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null ||:
+fi
 update-desktop-database &> /dev/null ||:
 
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
 %clean
 rm -rf %{buildroot}
 
@@ -91,11 +96,23 @@ rm -rf %{buildroot}
 %{_datadir}/applications/openlp.desktop
 %{_datadir}/icons/hicolor/*/apps/openlp.*
 %{_datadir}/openlp
-%{python_sitelib}/openlp/
-%{python_sitelib}/OpenLP-%{version}*.egg-info
+%{python3_sitelib}/openlp/
+%{python3_sitelib}/OpenLP-%{modname}*.egg-info
 
 
 %changelog
+* Sat Jan 24 2015 Tim Bentley Tim.Bentley at openlp.org - 2.1.2-1
+- 2.1.2 Beta 2 Release
+
+* Mon Nov 24 2014 Tim Bentley Tim.Bentley at openlp.org - 2.1.1-2
+- Remove libreoffice-headless
+
+* Sat Nov 1 2014 Tim Bentley Tim.Bentley at openlp.org - 2.1.1
+- 2.1.1 Beta Release 
+
+* Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 2.0.5-2
+- update/optimize icon/mime scriptlets
+
 * Fri Jun 27 2014 Tim Bentley Tim.Bentley at openlp.org - 2.0.5-1
 - 2.0.5 final release
 
diff --git a/sources b/sources
index bf96229..44e1246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c55803c30a608b28144a2ab58c21a750  OpenLP-2.0.5.tar.gz
+4bf3501e0fdeeae02fa2d8c1d2a10e2a  OpenLP-2.1.2.tar.gz