SPECS: cymbaline.spec - python module and mixer deps are runtime, ...

[qboosh]

Author: qboosh                       Date: Sat Jan 12 12:49:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- python module and mixer deps are runtime, not build time
- despite comment it uses gom instead of aumix as (optional) mixer
- set proper cdrom path in conf.py
- noarch

---- Files affected:
SPECS:
   cymbaline.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/cymbaline.spec
diff -u SPECS/cymbaline.spec:1.2 SPECS/cymbaline.spec:1.3
--- SPECS/cymbaline.spec:1.2	Sat Jan 12 13:28:32 2008
+++ SPECS/cymbaline.spec	Sat Jan 12 13:49:36 2008
@@ -1,8 +1,7 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	aumix	# build without volume control
-#
+# TODO:
+# - package gom mixer
+# - fix pyao usage to choose default driver instead of hardcoded alsa
 Summary:	An intelligent mp3 player
 Summary(pl.UTF-8):	Inteligentny odtwarzacz mp3
 Name:		cymbaline
@@ -13,12 +12,16 @@
 Source0:	http://silmarill.org/files/%{name}-%{version}.tar.gz
 # Source0-md5:	698e795be504ce9d77e9a55021daa0c9
 URL:		http://silmarill.org/cymbaline.htm
-%{?with_aumix:BuildRequires:	aumix}
-BuildRequires:	python-devel >= 1:2.0
-BuildRequires:	python-mad
-BuildRequires:	python-pyao-devel
+BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	sed >= 4.0
+# FIXME: alsa output is hardcoded (instead of default)
+Requires:	libao-alsa
+Requires:	python-mad
+Requires:	python-pyao
+Suggests:	gom
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,6 +44,8 @@
 %prep
 %setup -q
 
+sed -i -e 's,"/cdrom/","/media/cdrom/",' cypack/conf.py
+
 %build
 %{__python} setup.py build
 
@@ -51,7 +56,7 @@
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-install %{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv $RPM_BUILD_ROOT%{_bindir}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %py_postclean
 
@@ -62,7 +67,8 @@
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/%{name}
-%{py_sitescriptdir}/*
+%{py_sitescriptdir}/cypack
+%{py_sitescriptdir}/cymbaline-*.egg-info
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -70,6 +76,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-01-12 12:49:36  qboosh
+- python module and mixer deps are runtime, not build time
+- despite comment it uses gom instead of aumix as (optional) mixer
+- set proper cdrom path in conf.py
+- noarch
+
 Revision 1.2  2008-01-12 12:28:32  qboosh
 - typo, macros BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cymbaline.spec?r1=1.2&r2=1.3&f=u