rpms/vdr-burn/F-18 vdr-burn-0.1.0-pre21-no-subtitles.patch, 1.2, 1.3 vdr-burn.spec, 1.8, 1.9

[Martin Gansser]

Author: martinkg

Update of /cvs/free/rpms/vdr-burn/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7395/F-18

Modified Files:
	vdr-burn.spec 
Added Files:
	vdr-burn-0.1.0-pre21-no-subtitles.patch 
Log Message:


vdr-burn-0.1.0-pre21-no-subtitles.patch:
 ProjectX.ini |    3 +++
 1 file changed, 3 insertions(+)

Index: vdr-burn-0.1.0-pre21-no-subtitles.patch
===================================================================
RCS file: vdr-burn-0.1.0-pre21-no-subtitles.patch
diff -N vdr-burn-0.1.0-pre21-no-subtitles.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vdr-burn-0.1.0-pre21-no-subtitles.patch	11 Oct 2012 16:14:04 -0000	1.3
@@ -0,0 +1,10 @@
+diff -up burn-0.1.0-pre21/burn/ProjectX.ini~ burn-0.1.0-pre21/burn/ProjectX.ini
+--- burn-0.1.0-pre21/burn/ProjectX.ini~	2006-08-18 23:27:52.000000000 +0300
++++ burn-0.1.0-pre21/burn/ProjectX.ini	2008-04-22 20:10:59.000000000 +0300
+@@ -1,3 +1,6 @@
++# ExportPanel
++ExportPanel.Streamtype.Subpicture=0
++
+ # ExternPanel
+ ExternPanel.renameAudio=1
+ ExternPanel.renameVideo=1


Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vdr-burn.spec	11 Oct 2012 08:59:54 -0000	1.8
+++ vdr-burn.spec	11 Oct 2012 16:14:04 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        DVD writing plugin for VDR
 
 Group:          Applications/Multimedia
@@ -13,16 +13,17 @@
 Source0:        http://projects.vdr-developer.org/attachments/download/832/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Source2:        http://www.muempf.de/down/genindex-%{gver}.tar.gz
+Patch0:         %{name}-0.1.0-pre21-no-subtitles.patch
 # upstream patch >= vdr-1.7.27
 # http://projects.vdr-developer.org/news/172
-Patch0:         vdr-1.7.27-burn-0.2.0.diff
-Patch1:         %{name}-%{version}-config.patch
+Patch1:         vdr-1.7.27-burn-0.2.0.diff
+Patch2:         %{name}-%{version}-config.patch
 # upstream patch for Fedora 18
 # http://projects.vdr-developer.org/issues/1085
-Patch2:         %{name}-%{version}-PRIO_PGRP.patch
+Patch3:         %{name}-%{version}-PRIO_PGRP.patch
 # upstream patch
 # http://projects.vdr-developer.org/issues/1086
-Patch3:         %{name}-%{version}-fsf-fix.patch
+Patch4:         %{name}-%{version}-fsf-fix.patch
 
 BuildRequires:  vdr-devel >= 1.7.30
 BuildRequires:  boost-devel
@@ -35,7 +36,6 @@
 Requires:       mjpegtools
 Requires:       dvd+rw-tools
 Requires:       dejavu-lgc-sans-fonts
-Conflicts:      ProjectX < 0.90.4.00.b29
 
 %description
 This plugin enables VDR to write compliant DVDs from VDR recordings
@@ -50,14 +50,23 @@
 %setup -q -c -a 2
 
 cd burn-0.2.0
+
 find -name CVS | xargs rm -rf
+
 chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
-%patch0 -p0
+
+if pkg-config --atleast-version 1.5.10 vdr ; then
+# Disable subtitles by default for now with 1.6.x, demux problems
+%patch0 -p1
+fi
+# burn i18n.h patch
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
+
 sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
 
 cd ../genindex-%{gver}
@@ -108,10 +117,6 @@
 
 
 %changelog
-* Wed Oct 10 2012 Martin Gansser <linux4martin at gmx.de> - 0.2.0-2
-- removed vdrsync Requirenment
-- removed no-subtitle patch
-
 * Sun Oct 07 2012 Martin Gansser <linux4martin at gmx.de> - 0.2.0-1
 - spec file cleanup
 - rebuild for new release