From 7ed739d548e87d960625009dd2272afa668e073a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: May 27 2008 17:04:39 +0000 Subject: only try to use PowerISO as a converter on x86 platforms (bz 447214) --- diff --git a/AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch b/AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch new file mode 100644 index 0000000..58bf988 --- /dev/null +++ b/AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch @@ -0,0 +1,48 @@ +diff -up acetoneiso2/src/sources/a_converter.h.BAD acetoneiso2/src/sources/a_converter.h +--- acetoneiso2/src/sources/a_converter.h.BAD 2008-05-27 10:49:05.000000000 -0400 ++++ acetoneiso2/src/sources/a_converter.h 2008-05-27 11:57:50.000000000 -0400 +@@ -4,24 +4,29 @@ void acetoneiso::converter() + QDir acetone_bin = QDir::home(); + acetone_bin.cd(".acetoneiso"); + QFile poweriso_file( acetone_bin.path() + "/poweriso"); ++ #if defined(__i386__) || defined(__x86_64__) + if(!poweriso_file.exists()) +- get_poweriso(); ++ get_poweriso(); + else{ +- //estrazione qui +- QDir Home = QDir::home(); +- QString isodaconvertire; +- isodaconvertire = QFileDialog::getOpenFileName(this,tr("Open Image"), Home.path() , tr("Image Files (*.daa *.bin *.mdf *.ashdisc *.bwi *.b5i *.lcd *.img *.cdi *.cif *.p01 *.pdi *.nrg *.ncd *.pxi *.gi *.fcd *.vcd *.c2d)")); ++ //estrazione qui ++ QDir Home = QDir::home(); ++ QString isodaconvertire; ++ isodaconvertire = QFileDialog::getOpenFileName(this,tr("Open Image"), Home.path() , tr("Image Files (*.daa *.bin *.mdf *.ashdisc *.bwi *.b5i *.lcd *.img *.cdi *.cif *.p01 *.pdi *.nrg *.ncd *.pxi *.gi *.fcd *.vcd *.c2d)")); + if ( !isodaconvertire.isNull() ){ + +- QString fileName = QFileDialog::getSaveFileName(this, tr("AcetoneISO2::Save ISO file"), +- Home.path() , +- tr("Images (*.iso)")); +- if (!fileName.isNull() ) +- { +- fileName = fileName.append(".iso"); +- POweriso.start( poweriso_file.fileName(), QStringList() << "convert" << isodaconvertire << "-o" << fileName ); +- progBarra(); ++ QString fileName = QFileDialog::getSaveFileName(this, tr("AcetoneISO2::Save ISO file"), ++ Home.path() , ++ tr("Images (*.iso)")); ++ if (!fileName.isNull() ) ++ { ++ fileName = fileName.append(".iso"); ++ POweriso.start( poweriso_file.fileName(), QStringList() << "convert" << isodaconvertire << "-o" << fileName ); ++ progBarra(); ++ } + } +- } +- } ++ } ++ #else ++ // Not a poweriso capable architecture ++ QMessageBox::information(this, "AcetoneISO2",tr("Poweriso is not available for this architecture.")); ++ #endif + } diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index f299e09..6f5b790 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,6 +1,6 @@ Name: AcetoneISO2 Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 @@ -8,6 +8,7 @@ URL: http://www.acetoneteam.org/ Source0: http://downloads.sourceforge.net/acetoneiso2/acetoneiso2_%{version}_source.tar.bz2 Patch0: acetoneiso2-desktop.patch Patch1: acetoneiso2-2.0.2-no-optdirs.patch +Patch2: AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, qt4-devel, desktop-file-utils Requires: p7zip, cdrdao @@ -35,6 +36,7 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: %setup -q -n acetoneiso2 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build cd src/ @@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-* %changelog +* Tue May 27 2008 Tom "spot" Callaway - 2.0.2-4 +- only try to use PowerISO as a converter on x86 platforms (bz 447214) + * Fri May 9 2008 Tom "spot" Callaway - 2.0.2-3 - actually apply patch2 - get rid of requires on nautilus, this application works fine without it,