rpms/vdr-mp3/devel vdr-mp3-vdr2.1.2-compat.patch, NONE, 1.1 vdr-mp3.spec, 1.13, 1.14

[Martin Gansser]

Author: martinkg

Update of /cvs/free/rpms/vdr-mp3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32685/devel

Modified Files:
	vdr-mp3.spec 
Added Files:
	vdr-mp3-vdr2.1.2-compat.patch 
Log Message:


vdr-mp3-vdr2.1.2-compat.patch:
 decoder.c        |    4 ++++
 player-mplayer.c |    4 ++++
 2 files changed, 8 insertions(+)

--- NEW FILE vdr-mp3-vdr2.1.2-compat.patch ---
--- mp3-0.10.2/decoder.c.orig	2015-03-17 18:53:06.878520857 +0100
+++ mp3-0.10.2/decoder.c	2015-03-17 18:58:39.220995090 +0100
@@ -632,7 +632,11 @@
 
 char *cInfoCache::CacheFile(void)
 {
+#if APIVERSNUM >= 20102
+  return AddPath(cachedir?cachedir:cVideoDirectory::Name(),CACHEFILENAME);
+#else
   return AddPath(cachedir?cachedir:VideoDirectory,CACHEFILENAME);
+#endif
 }
 
 void cInfoCache::Save(bool force)
--- mp3-0.10.2/player-mplayer.c.orig	2015-03-17 19:00:13.313738264 +0100
+++ mp3-0.10.2/player-mplayer.c	2015-03-17 19:02:18.133997909 +0100
@@ -185,7 +185,11 @@
     if(MPlayerSetup.ResumeMode==1 || 
        (access(s,W_OK) && (errno==EACCES || errno==EROFS))) {
       global=true;
+#if APIVERSNUM >= 20102
+      resfile=AddPath(globalResumeDir?globalResumeDir:cVideoDirectory::Name(),GLOBAL_RESUME_FILE);
+#else
       resfile=AddPath(globalResumeDir?globalResumeDir:VideoDirectory,GLOBAL_RESUME_FILE);
+#endif
       d(printf("resume: using global file\n"))
       }
     else {


Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/devel/vdr-mp3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vdr-mp3.spec	1 Sep 2014 02:27:39 -0000	1.13
+++ vdr-mp3.spec	17 Mar 2015 18:09:02 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:           vdr-mp3
 Version:        0.10.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Sound playback plugin for VDR
 
 Group:          Applications/Multimedia
@@ -25,6 +25,7 @@
 Patch4:         %{name}-0.10.1-no-debug.patch
 Patch5:         %{name}-0.10.2-Makefile.patch
 Patch6:         %{name}-0.10.2-fsf-fix.patch
+Patch7:         %{name}-vdr2.1.2-compat.patch
 
 BuildRequires:  vdr-devel >= 2.0.6
 BuildRequires:  libsndfile-devel >= 1.0.0
@@ -63,6 +64,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %{__perl} -pi -e \
   's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \
   mplayer.sh
@@ -143,8 +145,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING HISTORY MANUAL README examples/mount.sh.example
+%doc HISTORY MANUAL README examples/mount.sh.example
 %doc examples/mp3sources.conf.example examples/network.sh.example
+%license COPYING
 %config(noreplace) %{vdr_configdir}/plugins/mp3sources.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
 %{vdr_plugindir}/libvdr-mp3.so.%{vdr_apiversion}
@@ -158,8 +161,9 @@
 
 %files -n vdr-mplayer
 %defattr(-,root,root,-)
-%doc COPYING HISTORY MANUAL README examples/mplayer.sh.example
+%doc HISTORY MANUAL README examples/mplayer.sh.example
 %doc examples/mount.sh.example
+%license COPYING
 %config(noreplace) %{vdr_configdir}/plugins/mplayer*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
 %{vdr_plugindir}/libvdr-mplayer.so.%{vdr_apiversion}
@@ -172,6 +176,10 @@
 
 
 %changelog
+* Tue Mar 17 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.10.2-11
+- added vdr-mp3-vdr2.1.2-compat.patch
+- mark license files as %%license where available
+
 * Mon Sep 01 2014 Sérgio Basto <sergio at serjux.com> - 0.10.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild