rpms/vdr-mp3/devel vdr-mp3-mp3sources.conf, NONE, 1.1 vdr-mp3.spec, 1.1, 1.2

[Felix Kaechele]

Author: felix

Update of /cvs/free/rpms/vdr-mp3/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27896

Modified Files:
	vdr-mp3.spec 
Added Files:
	vdr-mp3-mp3sources.conf 
Log Message:
* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-5
- removed all references to audiodir since it's not used by vdr core



--- NEW FILE vdr-mp3-mp3sources.conf ---
#
# Syntax is: <path>;<name>;<mount>
#
# <path>   = Path, where to finde mp3s or music directories
# <name>   = descriptor displayed in VDR
# <mount>  = 0 - if no mounting should be done
#            1 - if <path> needs to be mounted first.
#                (Dont forget to setup fstab !!!)
# <filter> = filters, what files should be displayed.
#            i.e. *.wav
#
# Sample: /mp3;Local mp3;0


Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/devel/vdr-mp3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-mp3.spec	4 Aug 2008 18:46:44 -0000	1.1
+++ vdr-mp3.spec	27 Nov 2008 23:21:47 -0000	1.2
@@ -6,7 +6,6 @@
 %define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
 %define videodir  %(vdr-config --videodir   2>/dev/null || echo ERROR)
-%define audiodir  %(vdr-config --audiodir   2>/dev/null || echo ERROR)
 %define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %define cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
 %define vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
@@ -15,7 +14,7 @@
 
 Name:           vdr-mp3
 Version:        0.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sound playback plugin for VDR
 
 Group:          Applications/Multimedia
@@ -88,7 +87,6 @@
 %build
 make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \
     libvdr-mp3.so libvdr-mplayer.so
-echo "%{audiodir};Local hard drive;0" > mp3sources.conf
 echo "%{datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
 
 
@@ -108,7 +106,7 @@
 
 # MP3 files
 install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
+install -pm 644 vdr-mp3-mp3sources.conf $RPM_BUILD_ROOT%{configdir}/plugins
 install -pm 755 examples/image_convert.sh.example \
   $RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
 %{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
@@ -141,9 +139,6 @@
   %{plugindir}/bin/mediasources.sh \
     >> %{configdir}/plugins/mp3sources.conf || :
 else
-  if ! grep %{audiodir} %{configdir}/plugins/mp3sources.conf &>/dev/null ; then
-    echo "%{audiodir}" >> %{configdir}/plugins/mp3sources.conf || :
-  fi
   r=global.mplayer.resume
   if [ -f %{videodir}/$r -a ! -f %{vardir}/$r ] ; then
     mv %{videodir}/$r %{vardir}/$r
@@ -188,6 +183,9 @@
 
 
 %changelog
+* Fri Nov 28 2008 Felix Kaechele <felix at fetzig dot org> - 0.10.1-5
+- removed all references to audiodir since it's not used by vdr core
+
 * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.10.1-4
 - rebuild