diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore 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 new file mode 100644 index 0000000..6f5b790 --- /dev/null +++ b/AcetoneISO2.spec @@ -0,0 +1,94 @@ +Name: AcetoneISO2 +Version: 2.0.2 +Release: 4%{?dist} +Summary: CD/DVD Image Manipulator +Group: Applications/Archiving +License: GPLv3 +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 +Requires: fuseiso, fuse, genisoimage +Requires: gnupg, pinentry-qt +# Overkill, but I'm being thorough +Requires: util-linux, coreutils + +%description +AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: +- Mount and Unmount ISO, MDF, NRG (if iso-9660 standard) +- Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi + *.xbx *.b5i *.bwi *.pdi +- Play a DVD Movie ISO with most used media players +- Generate an ISO from a Folder or CD/DVD +- Generate/Check MD5 file of an image +- Encrypt/decrypt an image +- Split image into X megabyte chunks +- Highly compress an image +- Rip a PSX cd to *.bin to make it work with epsxe/psx emulators +- Service-Menu support for Konqueror +- Restore a lost CUE file of *.bin *.img + +%prep +%setup -q -n acetoneiso2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +cd src/ +qmake-qt4 +make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +cd src +make INSTALL_ROOT=$RPM_BUILD_ROOT install +mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop + +desktop-file-install --vendor "" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category System \ + $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS CHANGELOG LICENSE README +%{_bindir}/acetoneiso2 +%{_datadir}/acetoneiso2 +%{_datadir}/applications/AcetoneISO2.desktop +%{_datadir}/pixmaps/Acetino2.png +%{_datadir}/apps/konqueror/servicemenus/acetoneiso2-* +%{_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, + it is simply enhanced by the presense of nautilus/konqueror + +* Fri May 9 2008 Tom "spot" Callaway - 2.0.2-2 +- fix requires, get rid of kdebase, cdrecord, k3b, xbiso, arts +- add requires on nautilus (really, it should be nautilus or konqueror, + but there is no good way to do that) + +* Wed May 7 2008 Tom "spot" Callaway - 2.0.2-1 +- 2.0.2 + +* Wed Apr 9 2008 Tom "spot" Callaway - 2.0.1-2 +- remove "Application" from desktop file (inside patch) + +* Fri Apr 4 2008 Tom "spot" Callaway - 2.0.1-1 +- 2.0.1 + +* Thu Nov 8 2007 Tom "spot" Callaway - 1.96-1 +- initial build for Fedora diff --git a/Makefile b/Makefile deleted file mode 100644 index c575906..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: AcetoneISO2 -# $Id$ -NAME := AcetoneISO2 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/acetoneiso2-2.0.2-no-optdirs.patch b/acetoneiso2-2.0.2-no-optdirs.patch new file mode 100644 index 0000000..5d65d2f --- /dev/null +++ b/acetoneiso2-2.0.2-no-optdirs.patch @@ -0,0 +1,74 @@ +diff -up acetoneiso2/src/acetoneiso2.pro.BAD acetoneiso2/src/acetoneiso2.pro +--- acetoneiso2/src/acetoneiso2.pro.BAD 2008-05-07 16:34:00.000000000 -0400 ++++ acetoneiso2/src/acetoneiso2.pro 2008-05-07 16:34:59.000000000 -0400 +@@ -71,7 +71,7 @@ QT += xml + menu.path = /usr/share/applications + #konqueror sm + sm.files = scripts/sm/scripts/* +- sm.path = /opt/acetoneiso ++ sm.path = /usr/share/acetoneiso2 + sml.files = scripts/sm/link/* + sml.path = /usr/share/apps/konqueror/servicemenus + #d3lphin sm +@@ -79,7 +79,7 @@ QT += xml + smdl.path = /usr/share/apps/d3lphin/servicemenus + #udf + udf.files = scripts/UDF/* +-udf.path = /opt/acetoneiso ++udf.path = /usr/share/acetoneiso2 + INSTALLS += target menuico menu sm sml smdl udf + + +diff -up acetoneiso2/src/scripts/sm/link/acetoneiso2-folder.desktop.BAD acetoneiso2/src/scripts/sm/link/acetoneiso2-folder.desktop +--- acetoneiso2/src/scripts/sm/link/acetoneiso2-folder.desktop.BAD 2008-05-07 16:36:44.000000000 -0400 ++++ acetoneiso2/src/scripts/sm/link/acetoneiso2-folder.desktop 2008-05-07 16:37:23.000000000 -0400 +@@ -8,7 +8,7 @@ Name[et]=Crea ISO de esta carpeta + Name[de]=Verursachen sie ISO von dieses verzeichnis + Name[fr]=Créez une ISO de celle-ci répertoire + Name[pl]=Stwórz ISO z tego folderu +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./isofolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./isofolder + Icon=/usr/share/pixmaps/Acetino2.png + + +@@ -20,7 +20,7 @@ Name[et]=Montar una imagen en aquesta ca + Name[de]=Einfassung ein bild diesbezüglich verzeichnis + Name[fr]=Monte une Image dans celle-ci répertoire + Name[pl]=Montuj obraz w tym folderze +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./mfolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./mfolder + Icon=/usr/share/pixmaps/Acetino2.png + + +@@ -34,7 +34,7 @@ Name[et]=Desmontar Carpeta + Name[de]=Bauen Sie auseinander verzeichnis + Name[fr]=Il démonte répertoire + Name[pl]=Odmontuj folder +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./ufolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./ufolder + Icon=/usr/share/pixmaps/Acetino2.png + + +diff -up acetoneiso2/src/scripts/sm/link/acetoneiso2-iso.desktop.BAD acetoneiso2/src/scripts/sm/link/acetoneiso2-iso.desktop +--- acetoneiso2/src/scripts/sm/link/acetoneiso2-iso.desktop.BAD 2008-05-07 16:37:50.000000000 -0400 ++++ acetoneiso2/src/scripts/sm/link/acetoneiso2-iso.desktop 2008-05-07 16:38:09.000000000 -0400 +@@ -14,6 +14,6 @@ Name[de]=Einfassung ISO mit AcetoneISO + Name[fr]=Monte ISO avec AcetoneISO + Name[pl]=Montuj ISO z AcetoneISO2 + Icon=/usr/share/pixmaps/Acetino2.png +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./smiso ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./smiso + + +diff -up acetoneiso2/src/sources/a_udf.h.BAD acetoneiso2/src/sources/a_udf.h +--- acetoneiso2/src/sources/a_udf.h.BAD 2008-05-07 16:35:26.000000000 -0400 ++++ acetoneiso2/src/sources/a_udf.h 2008-05-07 16:36:24.000000000 -0400 +@@ -21,7 +21,7 @@ if (!immagine.isNull() ){ + out << ( immagine ); + file.close(); + +-system ("/opt/acetoneiso/UDF&"); ++system ("/usr/share/acetoneiso2/UDF&"); + + } + } diff --git a/acetoneiso2-desktop.patch b/acetoneiso2-desktop.patch new file mode 100644 index 0000000..5b937c2 --- /dev/null +++ b/acetoneiso2-desktop.patch @@ -0,0 +1,26 @@ +diff -up acetoneiso2/src/menu/AcetoneISO.desktop.BAD acetoneiso2/src/menu/AcetoneISO.desktop +--- acetoneiso2/src/menu/AcetoneISO.desktop.BAD 2008-04-04 10:05:54.000000000 -0400 ++++ acetoneiso2/src/menu/AcetoneISO.desktop 2008-04-04 10:06:42.000000000 -0400 +@@ -1,21 +1,12 @@ + [Desktop Entry] +-Categories=KDE;Application;Utility +-Comment= +-Comment[it]= ++Categories=KDE;Utility; + Encoding=UTF-8 + Exec=acetoneiso2 +-GenericName= +-GenericName[it]= + Icon=/usr/share/pixmaps/Acetino2.png +-MimeType= + Name=AcetoneISO2 + GenericName= a CD/DVD image Tool + GenericName[it]= strumento per immagini CD/DVD +-Path= + StartupNotify=true + Terminal=false +-TerminalOptions= + Type=Application +-X-DCOP-ServiceType= + X-KDE-SubstituteUID=false +-X-KDE-Username= diff --git a/acetoneiso2-no-optdirs.patch b/acetoneiso2-no-optdirs.patch new file mode 100644 index 0000000..e975701 --- /dev/null +++ b/acetoneiso2-no-optdirs.patch @@ -0,0 +1,53 @@ +diff -up acetoneiso2/src/acetoneiso2.pro.BAD acetoneiso2/src/acetoneiso2.pro +--- acetoneiso2/src/acetoneiso2.pro.BAD 2008-04-04 10:12:09.000000000 -0400 ++++ acetoneiso2/src/acetoneiso2.pro 2008-04-04 10:12:19.000000000 -0400 +@@ -65,7 +65,7 @@ QT += xml + menu.files = menu/* + menu.path = /usr/share/applications + sm.files = sm/scripts/* +- sm.path = /opt/acetoneiso ++ sm.path = /usr/share/acetoneiso2 + sml.files = sm/link/* + sml.path = /usr/share/apps/konqueror/servicemenus + INSTALLS += target menuico menu sm sml +diff -up acetoneiso2/src/sm/link/acetoneiso2-folder.desktop.BAD acetoneiso2/src/sm/link/acetoneiso2-folder.desktop +--- acetoneiso2/src/sm/link/acetoneiso2-folder.desktop.BAD 2008-04-04 10:12:34.000000000 -0400 ++++ acetoneiso2/src/sm/link/acetoneiso2-folder.desktop 2008-04-04 10:13:03.000000000 -0400 +@@ -8,7 +8,7 @@ Name[et]=Crea ISO de esta carpeta + Name[de]=Verursachen sie ISO von dieses verzeichnis + Name[fr]=Créez une ISO de celle-ci répertoire + Name[pl]=Stwórz ISO z tego folderu +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./isofolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./isofolder + Icon=/usr/share/pixmaps/Acetino2.png + + +@@ -20,7 +20,7 @@ Name[et]=Montar una imagen en aquesta ca + Name[de]=Einfassung ein bild diesbezüglich verzeichnis + Name[fr]=Monte une Image dans celle-ci répertoire + Name[pl]=Montuj obraz w tym folderze +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./mfolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./mfolder + Icon=/usr/share/pixmaps/Acetino2.png + + +@@ -34,7 +34,7 @@ Name[et]=Desmontar Carpeta + Name[de]=Bauen Sie auseinander verzeichnis + Name[fr]=Il démonte répertoire + Name[pl]=Odmontuj folder +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./ufolder ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./ufolder + Icon=/usr/share/pixmaps/Acetino2.png + + +diff -up acetoneiso2/src/sm/link/acetoneiso2-iso.desktop.BAD acetoneiso2/src/sm/link/acetoneiso2-iso.desktop +--- acetoneiso2/src/sm/link/acetoneiso2-iso.desktop.BAD 2008-04-04 10:13:17.000000000 -0400 ++++ acetoneiso2/src/sm/link/acetoneiso2-iso.desktop 2008-04-04 10:13:25.000000000 -0400 +@@ -14,6 +14,6 @@ Name[de]=Einfassung ISO mit AcetoneISO + Name[fr]=Monte ISO avec AcetoneISO + Name[pl]=Montuj ISO z AcetoneISO2 + Icon=/usr/share/pixmaps/Acetino2.png +-Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/opt/acetoneiso/./smiso ++Exec=rm $HOME/acetonesm;echo "%f" > $HOME/acetonesm;/usr/share/acetoneiso2/./smiso + + diff --git a/sources b/sources index e69de29..8610dd4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e38209ce6667da07f1182b02549eb6e2 acetoneiso2_2.0.2_source.tar.bz2