rpms/k3b/F-12 k3b-1.0.5-progress_rate.patch, 1.1, 1.2 k3b.spec, 1.78, 1.79

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22519

Modified Files:
	k3b-1.0.5-progress_rate.patch k3b.spec 
Log Message:
fix/rebase progress_rate patch


k3b-1.0.5-progress_rate.patch:
 k3bvideodvdtitletranscodingjob.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: k3b-1.0.5-progress_rate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b-1.0.5-progress_rate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- k3b-1.0.5-progress_rate.patch	6 Dec 2009 22:22:21 -0000	1.1
+++ k3b-1.0.5-progress_rate.patch	6 Dec 2009 22:57:02 -0000	1.2
@@ -1,6 +1,15 @@
---- branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2007/06/02 15:56:08	670810
-+++ branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009/12/06 22:04:47	1059542
-@@ -206,10 +206,11 @@
+diff -up k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+--- k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate	2008-05-27 03:24:20.000000000 -0500
++++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009-12-06 16:56:02.389585008 -0600
+@@ -27,6 +27,7 @@
+ #include <qfile.h>
+ #include <qfileinfo.h>
+ 
++inline const int qMax(const int a, const int b) { if (a < b) return b; return a; }
+ 
+ class K3bVideoDVDTitleTranscodingJob::Private
+ {
+@@ -206,10 +207,11 @@ void K3bVideoDVDTitleTranscodingJob::sta
      *d->process << "--nice" << "19";
  
    // we only need 100 steps, but to make sure we use 150


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- k3b.spec	6 Dec 2009 22:22:21 -0000	1.78
+++ k3b.spec	6 Dec 2009 22:57:02 -0000	1.79
@@ -51,7 +51,7 @@ Patch102: reload-for-verification.diff
 Patch105: k3b-1.0.5-hidden.patch
 # 
 Patch106: k3b-1.0.5-desktopfile.patch
-# http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
+# based on http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
 Patch107: k3b-1.0.5-progress_rate.patch
 
 BuildRequires: %{kdelibs3}-devel
@@ -144,7 +144,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch
 %patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
 %patch106 -p1 -b .desktopfile
-%patch107 -p5 -b .progress_rate
+%patch107 -p1 -b .progress_rate
 
 
 %build