[k3b] - use growisofs for blueray too (#610976)

[Rex Dieter]

commit 7521d073d879b37db3f6915ec1923890ed91e5ab
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 20 07:30:14 2011 -0600

    - use growisofs for blueray too (#610976)

 ... k3b-2.0.2-use_growisofs_instead_of_wodim.patch |   14 +++++++++-----
 k3b.spec                                           |   11 +++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch b/k3b-2.0.2-use_growisofs_instead_of_wodim.patch
similarity index 70%
rename from k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
rename to k3b-2.0.2-use_growisofs_instead_of_wodim.patch
index 4afa3d1..b0b5d3c 100644
--- a/k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
+++ b/k3b-2.0.2-use_growisofs_instead_of_wodim.patch
@@ -1,6 +1,6 @@
-diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp
---- k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds	2011-01-15 14:47:30.000000000 -0600
-+++ k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp	2011-01-19 08:19:21.953526402 -0600
+diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_instead_of_wodim_for_dvds k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp
+--- k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_instead_of_wodim_for_dvds	2011-01-15 14:47:30.000000000 -0600
++++ k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp	2011-01-20 07:27:20.864494300 -0600
 @@ -261,11 +261,13 @@ bool K3b::MetaWriter::determineUsedAppAn
      bool cdrecordOnTheFly = false;
      bool cdrecordCdText = false;
@@ -15,7 +15,7 @@ diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds k3b-2.0.
      }
      if( k3bcore->externalBinManager()->binObject("growisofs") ) {
          growisofsBluRay = k3bcore->externalBinManager()->binObject("growisofs")->hasFeature( "blu-ray" );
-@@ -316,7 +318,13 @@ bool K3b::MetaWriter::determineUsedAppAn
+@@ -316,10 +318,16 @@ bool K3b::MetaWriter::determineUsedAppAn
                  d->usedWritingApp = WritingAppGrowisofs;
              }
              else if( mediaType & Device::MEDIA_DVD_ALL ) {
@@ -29,4 +29,8 @@ diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds k3b-2.0.
 +                }
              }
              else if( mediaType & Device::MEDIA_BD_ALL ) {
-                 if( cdrecordBluRay ) {
+-                if( cdrecordBluRay ) {
++                if( cdrecordBluRay && ! cdrecordWodim ) {
+                     d->usedWritingApp = WritingAppCdrecord;
+                 }
+                 else if( growisofsBluRay ) {
diff --git a/k3b.spec b/k3b.spec
index 0d88955..9ba578e 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -3,7 +3,7 @@ Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -20,8 +20,8 @@ ExcludeArch: s390 s390x
 # we'll see which approach upstream likes best
 # use growisofs for all dvds
 Patch50: k3b-2.0.2-use_growisofs_for_dvds.patch
-# use growisofs (intead of wodim) for dvds
-Patch51: k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
+# use growisofs (intead of wodim) for blueray/dvd
+Patch51: k3b-2.0.2-use_growisofs_instead_of_wodim.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: flac-devel
@@ -82,7 +82,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch51 -p1 -b .use_growisofs_instead_of_wodim_for_dvds
+%patch51 -p1 -b .use_growisofs_instead_of_wodim
 
 
 %build
@@ -177,6 +177,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Thu Jan 20 2011 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.2-2
+- use growisofs for blueray too (#610976)
+
 * Wed Jan 19 2011 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.2-1
 - k3b-2.0.2 (#670325)
 - use growisofs for dvd's (#610976)