rpms/AcetoneISO2/F-8 AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch, NONE, 1.1 AcetoneISO2.spec, 1.4, 1.5
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue May 27 17:05:08 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/AcetoneISO2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv881/F-8
Modified Files:
AcetoneISO2.spec
Added Files:
AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch
Log Message:
only try to use PowerISO as a converter on x86 platforms (bz 447214)
AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch:
--- NEW FILE AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch ---
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
}
Index: AcetoneISO2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/AcetoneISO2/F-8/AcetoneISO2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AcetoneISO2.spec 9 May 2008 20:56:33 -0000 1.4
+++ AcetoneISO2.spec 27 May 2008 17:03:50 -0000 1.5
@@ -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 @@
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 @@
%setup -q -n acetoneiso2
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
cd src/
@@ -66,6 +68,9 @@
%{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-*
%changelog
+* Tue May 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.2-4
+- only try to use PowerISO as a converter on x86 platforms (bz 447214)
+
* Fri May 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.2-3
- actually apply patch2
- get rid of requires on nautilus, this application works fine without it,
More information about the fedora-extras-commits
mailing list