openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/release-1.9.1-fedora into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Cleanups required as part of Fedora packaging.
-- 
https://code.launchpad.net/~trb143/openlp/release-1.9.1-fedora/+merge/23038
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'documentation/pyqt-sql-py2exe.txt'
--- documentation/pyqt-sql-py2exe.txt	2009-09-13 15:14:45 +0000
+++ documentation/pyqt-sql-py2exe.txt	2010-04-08 16:04:23 +0000
@@ -26,11 +26,11 @@
 mapper( Customer, Table('customers', metadata ) )
 
 session = Session()
-customer = Customer( businessName=“Jamb Safety”,
-    website=“www.jamb.com” )
+customer = Customer( businessName=�Jamb Safety�,
+    website=�www.jamb.com� )
 session.save( customer )
 for customer in Session.query(Customer).filter(
-    Customer.businessName.like(“Jamb%”)):
+    Customer.businessName.like(�Jamb%�)):
     print customer.businessName
 session.commit()
 
@@ -46,10 +46,10 @@
     author="Sankel Software",
     author_email="david@xxxxxxxxxxxxxxxxxx",
     url="http://sankelsoftware.com";,
-    license=“GPL",
-    version=“1.0.0",
-    windows=[ { "script":"main.py“,}],
-    options={"py2exe":{"includes":["sip”]}},
+    license=�GPL",
+    version=�1.0.0",
+    windows=[ { "script":"main.py�,}],
+    options={"py2exe":{"includes":["sip�]}},
     data_files=[
        ("forms",glob.glob("forms/*.ui")),
     ] )

=== modified file 'openlp/.version'
--- openlp/.version	2010-03-27 12:37:21 +0000
+++ openlp/.version	2010-04-08 16:04:23 +0000
@@ -1,1 +1,1 @@
-1.9.0
+1.9.1-bzr778
\ No newline at end of file

=== added directory 'resources/fedora'
=== added file 'resources/fedora/OpenLP.spec'
--- resources/fedora/OpenLP.spec	1970-01-01 00:00:00 +0000
+++ resources/fedora/OpenLP.spec	2010-04-08 16:04:23 +0000
@@ -0,0 +1,93 @@
+%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Summary: Open source Church presentation and lyrics projection application
+Name: OpenLP
+Version: 1.9.1.1
+Release: 1%{?dist}
+Source0: http://downloads.sourceforge.net/openlp/openlp/%{version}/%{name}-%{version}.tar.gz
+License: GPLv2
+Group: Applications/Multimedia
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+URL: http://openlp.org/
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+
+Requires:       python
+Requires:       PyQt4
+Requires:       phonon
+Requires:       python-BeautifulSoup
+Requires:       python-chardet
+Requires:       python-lxml
+Requires:       python-sqlalchemy
+Requires:       hicolor-icon-theme
+
+%description
+OpenLP is a church presentation software, for lyrics projection software,
+used to display slides of songs,  Bible verses, videos, images, and 
+presentations (if openoffice.org is installed) using a computer and a data
+projector.
+
+%prep
+%setup -q 
+
+%build
+python setup.py build
+
+%install
+rm -rf %{buildroot}
+python 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
+install -m644 -p -D resources/images/openlp-logo-32x32.png \
+   %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/openlp.png
+install -m644 -p -D resources/images/openlp-logo-48x48.png \
+   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/openlp.png
+install -m644 -p -D resources/images/openlp-logo.svg \
+   %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/openlp.svg
+
+desktop-file-install \
+  --dir %{buildroot}/%{_datadir}/applications \
+  resources/openlp.desktop 
+
+mv %{buildroot}%{_bindir}/bible-1to2-converter.py \
+   %{buildroot}%{_bindir}/bible-1to2-converter
+mv %{buildroot}%{_bindir}/openlp-1to2-converter.py \
+   %{buildroot}%{_bindir}/openlp-1to2-converter
+mv %{buildroot}%{_bindir}/openlp-remoteclient.py \
+   %{buildroot}%{_bindir}/openlp-remoteclient
+mv %{buildroot}%{_bindir}/openlp.pyw %{buildroot}%{_bindir}/openlp
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+
+%clean
+rm -rf %{buildroot}
+
+%files 
+%defattr(-,root,root)
+%doc copyright.txt LICENSE
+%{_bindir}/bible-1to2-converter
+%{_bindir}/openlp-1to2-converter
+%{_bindir}/openlp-remoteclient
+%{_bindir}/openlp
+%{_datadir}/applications/openlp.desktop
+%{_datadir}/icons/hicolor/*/apps/openlp.*
+%{python_sitelib}/openlp/
+%{python_sitelib}/OpenLP-%{version}*.egg-info
+%doc documentation/*.txt
+
+%changelog
+* Sun Mar 28 2010 Tim Bentley <timbentley@xxxxxxxxxx> 1.9.1.1
+- Initial build version - Alpha 1 Release

=== renamed file 'openlp/plugins/remotes/remoteclient.py' => 'scripts/openlp-remoteclient.py'
--- openlp/plugins/remotes/remoteclient.py	2010-03-21 23:58:01 +0000
+++ scripts/openlp-remoteclient.py	2010-04-08 16:04:23 +0000
@@ -38,7 +38,7 @@
         print u'Errow thrown ', sys.exc_info()[1]
 
 def format_message(options):
-    return u'%s:%s' % (options.event, options.message)
+    return u'%s:%s' % (u'alert', options.message)
 
 def main():
     usage = "usage: %prog [options] arg1 arg2"

=== modified file 'setup.py'
--- setup.py	2010-03-21 23:58:01 +0000
+++ setup.py	2010-04-08 16:04:23 +0000
@@ -68,7 +68,8 @@
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py',
+    'scripts/bible-1to2-converter.py','scripts/openlp-remoteclient.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[