rpms/vdr-burn/devel vdr-burn-vdr2.1.2-compat.patch, NONE, 1.1 vdr-burn.spec, 1.16, 1.17

[Martin Gansser]

Author: martinkg

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

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


vdr-burn-vdr2.1.2-compat.patch:
 jobs.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE vdr-burn-vdr2.1.2-compat.patch ---
--- burn/jobs.c.orig	2015-03-17 17:57:47.326448269 +0100
+++ burn/jobs.c	2015-03-17 18:14:18.232493156 +0100
@@ -263,7 +263,11 @@
 	std::string recording::get_graft_point() const
 	{
 		return proctools::format("{0}={1}")
+#if VDRVERSNUM >= 20102
+			   % m_fileName.substr(std::string(cVideoDirectory::Name()).length())
+#else
 			   % m_fileName.substr(std::string(VideoDirectory).length())
+#endif
 			   % m_fileName;
 	}
 


Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/devel/vdr-burn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vdr-burn.spec	1 Sep 2014 02:26:57 -0000	1.16
+++ vdr-burn.spec	17 Mar 2015 17:33:43 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.2.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        DVD writing plugin for VDR
 
 # genindex is GPLv2+, rest GPL+
@@ -14,6 +14,7 @@
 Source1:        %{name}.conf
 Source2:        http://www.muempf.de/down/genindex-%{gver}.tar.gz
 Patch0:         %{name}-0.2.2-config.patch
+Patch1:         %{name}-vdr2.1.2-compat.patch
 
 BuildRequires:  vdr-devel >= 2.0.6
 BuildRequires:  boost-devel
@@ -43,6 +44,7 @@
 mv %{pname}-%{version} burn ; cd burn
 
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
 
@@ -78,7 +80,8 @@
 
 
 %files -f %{name}.lang
-%doc burn/COPYING burn/HISTORY burn/README README.genindex
+%doc burn/HISTORY burn/README README.genindex
+%license burn/COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %config(noreplace) %{vdr_configdir}/plugins/%{pname}/
 %{vdr_libdir}/bin/genindex
@@ -91,6 +94,10 @@
 
 
 %changelog
+* Tue Mar 17 2015 Martin Gansser <martinkg at fedoraproject.org> - 0.2.2-8
+- added vdr-burn-vdr2.1.2-compat.patch
+- mark license files as %%license where available
+
 * Mon Sep 01 2014 Sérgio Basto <sergio at serjux.com> - 0.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild