[SCM] morituri/master: * README: Fix up dependencies. * morituri.spec.in: Fix dependencies and noarch install location. * morituri/common/Makefile.am: Add result.py to dist

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 402c3c019a1d6d227c1a326ba24fdac92535e87e
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Sep 6 17:08:17 2009 +0000

    	* README:
    	  Fix up dependencies.
    	* morituri.spec.in:
    	  Fix dependencies and noarch install location.
    	* morituri/common/Makefile.am:
    	  Add result.py to dist

diff --git a/ChangeLog b/ChangeLog
index 31033eb..61a2ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-09-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* README:
+	  Fix up dependencies.
+	* morituri.spec.in:
+	  Fix dependencies and noarch install location.
+	* morituri/common/Makefile.am:
+	  Add result.py to dist
+
+2009-09-06  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* configure.ac:
 	* m4/Makefile.am:
 	* m4/as-ac-expand.m4 (added):
diff --git a/README b/README
index be78824..52e1e7d 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ REQUIREMENTS
 ------------
 - cdparanoia, for the actual ripping
 - cdrdao, for session, TOC, pregap, and ISRC extraction
-- GStreamer, for encoding
+- GStreamer and its python bindings, for encoding
 - python musicbrainz2, for metadata lookup
 - pycdio, for drive identification (optional)
 
diff --git a/morituri.spec.in b/morituri.spec.in
index 5814afa..7d4cd70 100644
--- a/morituri.spec.in
+++ b/morituri.spec.in
@@ -1,4 +1,5 @@
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           morituri
 Version:        @PACKAGE_VERSION@
@@ -6,12 +7,22 @@ Release:        @PACKAGE_VERSION_RELEASE@%{?dist}
 Summary:        CD ripper
 Source:         %{name}-%{version}.tar.bz2
 URL:            http://thomas.apestaart.org/thomas/trac/
-License:        GPL
+License:        GPLv2
 Group:          Applications/Archiving
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
+BuildRequires:  pygobject2
+BuildRequires:  gstreamer-python
+
+Requires:       cdparanoia
+Requires:       cdrdao
+Requires:       gstreamer-plugins-good
+Requires:       gstreamer-python
+Requires:       python-musicbrainz2
+
+
 %description
 Morituri is a CD ripper.
 
@@ -34,9 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README morituri.doap NEWS RELEASE ChangeLog
 %{_bindir}/rip
 #%{_mandir}/man1/rip.1*
-%{_libdir}/python*.*/site-packages/morituri
+%{python_sitelib}/morituri
 %{_sysconfdir}/bash_completion.d/rip
 
 %changelog
+* Sun Sep 06 2009 Thomas Vander Stichele <thomas at apestaart dot org>
+- added requires
+
 * Wed May 20 2009 Thomas Vander Stichele <thomas at apestaart dot org>
 - created package
diff --git a/morituri/common/Makefile.am b/morituri/common/Makefile.am
index 4b08b87..1d6e909 100644
--- a/morituri/common/Makefile.am
+++ b/morituri/common/Makefile.am
@@ -13,5 +13,6 @@ morituri_PYTHON = \
 	logcommand.py \
 	program.py \
 	renamer.py \
+	result.py \
 	task.py \
 	taskgtk.py

-- 
morituri packaging