[impressive] 0.10.3-3

[mjg]

commit 3209089b8a5eec9ff3720599e9353223d5312348
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Fri Dec 3 21:54:48 2010 +0100

    0.10.3-3
    
    - Sync with upstream.
    - spec file cleanup.
    - Make summary less flashy.
    - Install main program in sitelib.
    - BR python-devel.

 .gitignore      |    1 +
 impressive.sh   |    4 ++--
 impressive.spec |   55 +++++++++++++++++++++++++++++--------------------------
 sources         |    2 +-
 4 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d35553c..db80ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Impressive-0.10.2.tar.gz
+/Impressive-0.10.3.tar.gz
diff --git a/impressive.sh b/impressive.sh
old mode 100755
new mode 100644
index c9e7a37..d9f7e13
--- a/impressive.sh
+++ b/impressive.sh
@@ -2,8 +2,8 @@
 
 . /usr/share/opengl-games-utils/opengl-game-functions.sh
 
-APP=python-impressive
+APP=impressive
 
 checkDriOK $APP
 
-exec $APP "$@"
+exec @PYTHON_SITELIB@/$APP.py "$@"
diff --git a/impressive.spec b/impressive.spec
index e343e94..f378e33 100644
--- a/impressive.spec
+++ b/impressive.spec
@@ -1,34 +1,25 @@
 Name:           impressive
-Version:        0.10.2
-Release:        8%{?dist}
-Summary:        The stylish way of giving presentations
+Version:        0.10.3
+Release:        3%{?dist}
+Summary:        A program that displays presentation slides
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://impressive.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz
+# Wrapper script for making sure hardware acceleration is available
 Source1:        %{name}.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 BuildArch:      noarch
+BuildRequires:  python-devel
+# The following requires are not picked up by rpm:
 Requires:       python-imaging
-Requires:       pygame 
-Requires:       PyOpenGL 
+Requires:       pygame
+Requires:       PyOpenGL
 Requires:       opengl-games-utils
 Requires:       xpdf
 Requires:       xdg-utils
-Requires:       opengl-games-utils
-
-%if 0%{?fedora} > 10
 Requires:       dejavu-sans-fonts
-%endif
-
-%if 0%{?fedora} <= 10
-Requires:       dejavu-fonts
-%endif
-
-Provides:  keyjnote = %{version}-%{release}
-Obsoletes: keyjnote < 0.10.2-3
 
 
 %description
@@ -46,28 +37,40 @@ that are really useful for presentations.
 
 
 %build
-# This package don't build anything, just copy files under build root.
+sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh
+# This package doesn't build anything, just copy files under build root.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -D -p -m 755 impressive.py $RPM_BUILD_ROOT%{_bindir}/python-impressive
-install -D -p -m 644 impressive.1 $RPM_BUILD_ROOT%{_mandir}/man1/impressive.1
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+rm -rf %{buildroot}
+install -D -p -m 755 impressive.py %{buildroot}%{python_sitelib}/impressive.py
+install -D -p -m 644 impressive.1 %{buildroot}%{_mandir}/man1/impressive.1
+install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
 %doc changelog.txt demo.pdf impressive.html license.txt
-%{_bindir}/%{name}
-%{_bindir}/python-%{name}
-%{_mandir}/man1/*
+%{_bindir}/impressive
+%{python_sitelib}/impressive.py*
+%{_mandir}/man1/impressive.1*
 
 %changelog
+* Sun Dec 05 2010 Michael J Gruber <mjg at fedorapproject.org> - 0.10.3-3
+- spec file cleanup.
+
+* Sun Dec 05 2010 Michael J Gruber <mjg at fedorapproject.org> - 0.10.3-2
+- Make summary less flashy.
+- Install main program in sitelib.
+- BR python-devel.
+
+* Fri Dec 03 2010 Michael J Gruber <mjg at fedorapproject.org> - 0.10.3-1
+- Sync with upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 63505ad..696a113 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-492eda5e3e09beb2f6dc997ed94f5349  Impressive-0.10.2.tar.gz
+1fefb25db71ee322a59353de85ae00b4  Impressive-0.10.3.tar.gz