rpms/k3b/devel k3b-1.0.5-kde#156684.patch, NONE, 1.1 k3b.spec, 1.63, 1.64

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24348

Modified Files:
	k3b.spec 
Added Files:
	k3b-1.0.5-kde#156684.patch 
Log Message:
* Thu Jul 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-4
- try alternative fix for tray eject/reload (kde#156684)


k3b-1.0.5-kde#156684.patch:

--- NEW FILE k3b-1.0.5-kde#156684.patch ---
diff -up k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684 k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp
--- k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684	2008-05-27 03:24:19.000000000 -0500
+++ k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp	2008-07-31 08:17:39.000000000 -0500
@@ -243,9 +243,11 @@ void K3bCdrecordWriter::prepareProcess()
     *m_process << "textfile=" + d->cdTextFile->name();
   }
 
+#if 0
   if( k3bcore->globalSettings()->ejectMedia() &&
       !m_forceNoEject )
     *m_process << "-eject";
+#endif
 
   bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
   if( manualBufferSize ) {


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- k3b.spec	30 Jun 2008 15:28:22 -0000	1.63
+++ k3b.spec	31 Jul 2008 13:23:44 -0000	1.64
@@ -14,7 +14,7 @@
 Summary: CD/DVD burning application for KDE
 Epoch:   0
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -29,12 +29,16 @@
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
 Patch2: k3b-1.0.3-umount.patch
-# http://bugs.kde.org/151816 , k3b can't reload media for verification
-Patch3: k3b-1.0.4-kde#151816.patch
 Patch4: k3b-1.0.4-manualbufsize.patch
 # put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
 Patch5: k3b-1.0.5-hidden.patch
 
+# upstream patches
+# http://bugs.kde.org/151816 , k3b can't reload media for verification
+Patch100: k3b-1.0.4-kde#151816.patch
+# http://bugs.kde.org/156684 , alternative to patch100
+Patch101: k3b-1.0.5-kde#156684.patch
+
 BuildRequires: kdelibs3-devel 
 BuildRequires: desktop-file-utils
 # needed by patch1
@@ -95,10 +99,13 @@
 %setup -q -a 1 -n %{name}-%{version}
 
 %patch2 -p1 -b .umount
-%patch3 -p1 -b .kde#151816
 # set in k3brc instead
 #patch4 -p1 -b .manualbufsize
 %patch5 -p1 -b .hidden
+
+#patch100 -p1 -b .kde#151816
+%patch101 -p1 -b .kde#156684
+
 make -f admin/Makefile.common
 
 pushd %{name}-i18n-%{version}
@@ -242,6 +249,9 @@
 
 
 %changelog
+* Thu Jul 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-4
+- try alternative fix for tray eject/reload (kde#156684)
+
 * Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-3
 - No association k3b with .iso files in gnome (#419681)
 - scriptlet deps