From c5fcd3d5ee6be6ba32052cdd65f62dd05f9152f3 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 9 Apr 2008 15:38:03 +0000 Subject: [PATCH 01/11] Initialize branch F-9 for AcetoneISO2 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 66417805c84ebe93ab2da2f2771f02acd5a0e39c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 25 Apr 2008 20:10:20 +0000 Subject: [PATCH 02/11] f-9 branch --- AcetoneISO2.spec | 75 ++++++++++++++++++++++++++++++++++++ acetoneiso2-desktop.patch | 26 +++++++++++++ acetoneiso2-no-optdirs.patch | 53 +++++++++++++++++++++++++ sources | 1 + 4 files changed, 155 insertions(+) create mode 100644 AcetoneISO2.spec create mode 100644 acetoneiso2-desktop.patch create mode 100644 acetoneiso2-no-optdirs.patch diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec new file mode 100644 index 0000000..112554b --- /dev/null +++ b/AcetoneISO2.spec @@ -0,0 +1,75 @@ +Name: AcetoneISO2 +Version: 2.0.1 +Release: 2%{?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.gz +Patch0: acetoneiso2-desktop.patch +Patch1: acetoneiso2-no-optdirs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: kdewebdev-devel, qt4-devel, desktop-file-utils +Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao +Requires: fuseiso, fuse, genisoimage +Requires: cdrecord, 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 + +%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-* + +%changelog +* 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/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..5383c23 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ab7e77fdd5ca7f2407166338982ec819 acetoneiso2_2.0.1-source.tar.gz From f46094b865ca8bda9e0f8bd27042f895b40c25d4 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 May 2008 20:50:51 +0000 Subject: [PATCH 03/11] update to 2.0.2 --- AcetoneISO2.spec | 14 ++++-- acetoneiso2-2.0.2-no-optdirs.patch | 74 ++++++++++++++++++++++++++++++ sources | 2 +- 3 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 acetoneiso2-2.0.2-no-optdirs.patch diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 112554b..b157ff3 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,13 +1,13 @@ Name: AcetoneISO2 -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?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.gz +Source0: http://downloads.sourceforge.net/acetoneiso2/acetoneiso2_%{version}_source.tar.bz2 Patch0: acetoneiso2-desktop.patch -Patch1: acetoneiso2-no-optdirs.patch +Patch1: acetoneiso2-2.0.2-no-optdirs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, qt4-devel, desktop-file-utils Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao @@ -34,7 +34,7 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: %prep %setup -q -n acetoneiso2 %patch0 -p1 -%patch1 -p1 +%%patch1 -p1 %build cd src/ @@ -63,8 +63,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/AcetoneISO2.desktop %{_datadir}/pixmaps/Acetino2.png %{_datadir}/apps/konqueror/servicemenus/acetoneiso2-* +%{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-* %changelog +* 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) 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/sources b/sources index 5383c23..8610dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab7e77fdd5ca7f2407166338982ec819 acetoneiso2_2.0.1-source.tar.gz +e38209ce6667da07f1182b02549eb6e2 acetoneiso2_2.0.2_source.tar.bz2 From e9a417480fc42aa8b8d5fc704ed1bfbd85e21728 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 9 May 2008 15:10:11 +0000 Subject: [PATCH 04/11] fix requires --- AcetoneISO2.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index b157ff3..e4ed19f 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,6 +1,6 @@ Name: AcetoneISO2 Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 @@ -10,9 +10,9 @@ Patch0: acetoneiso2-desktop.patch Patch1: acetoneiso2-2.0.2-no-optdirs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, qt4-devel, desktop-file-utils -Requires: p7zip, xbiso, k3b, kdebase, arts, cdrdao +Requires: p7zip, nautilus, cdrdao Requires: fuseiso, fuse, genisoimage -Requires: cdrecord, gnupg, pinentry-qt +Requires: gnupg, pinentry-qt # Overkill, but I'm being thorough Requires: util-linux, coreutils @@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-* %changelog +* 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 From 97dbbc9450917f7ca4b41d510096a466888b62b1 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 9 May 2008 20:56:39 +0000 Subject: [PATCH 05/11] apply patch2, drop requires nautilus --- AcetoneISO2.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index e4ed19f..f299e09 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,6 +1,6 @@ Name: AcetoneISO2 Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 @@ -10,7 +10,7 @@ Patch0: acetoneiso2-desktop.patch Patch1: acetoneiso2-2.0.2-no-optdirs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdewebdev-devel, qt4-devel, desktop-file-utils -Requires: p7zip, nautilus, cdrdao +Requires: p7zip, cdrdao Requires: fuseiso, fuse, genisoimage Requires: gnupg, pinentry-qt # Overkill, but I'm being thorough @@ -34,7 +34,7 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: %prep %setup -q -n acetoneiso2 %patch0 -p1 -%%patch1 -p1 +%patch1 -p1 %build cd src/ @@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-* %changelog +* 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, From d34a1a3b7d53993c3d28c2cf0644a1dc9b99e374 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 27 May 2008 17:04:09 +0000 Subject: [PATCH 06/11] only try to use PowerISO as a converter on x86 platforms (bz 447214) --- ...neISO2-2.0.2-no-poweriso-for-non-x86.patch | 48 +++++++++++++++++++ AcetoneISO2.spec | 7 ++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch 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, From dcbace7111e652b4451db1e3dd07784b51a71582 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 8 Dec 2008 23:00:37 +0000 Subject: [PATCH 07/11] 2.0.3RC1 --- AcetoneISO2.spec | 31 ++++++++++++++++++------------- sources | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 6f5b790..762e280 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,14 +1,16 @@ +%define prever RC1 + Name: AcetoneISO2 -Version: 2.0.2 -Release: 4%{?dist} +Version: 2.0.3 +Release: 0.1.%{prever}%{?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 +Source0: http://www.acetoneteam.org/download/acetoneiso_%{version}%{prever}.tar.gz +Patch0: acetoneiso2-2.0.3-desktop.patch Patch1: acetoneiso2-2.0.2-no-optdirs.patch -Patch2: AcetoneISO2-2.0.2-no-poweriso-for-non-x86.patch +Patch2: AcetoneISO2-2.0.3-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 @@ -29,25 +31,27 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: - 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 +%setup -q -n acetoneiso_%{version}%{prever} %patch0 -p1 -%patch1 -p1 +# %%patch1 -p1 %patch2 -p1 %build -cd src/ +cd acetoneiso/ qmake-qt4 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -cd src +cd acetoneiso make INSTALL_ROOT=$RPM_BUILD_ROOT install mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop +mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2 + +sed -i 's|Exec=acetoneiso|Exec=acetoneiso2|g' $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -61,13 +65,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS CHANGELOG LICENSE README %{_bindir}/acetoneiso2 -%{_datadir}/acetoneiso2 +# %%{_datadir}/acetoneiso2 %{_datadir}/applications/AcetoneISO2.desktop %{_datadir}/pixmaps/Acetino2.png -%{_datadir}/apps/konqueror/servicemenus/acetoneiso2-* -%{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-* %changelog +* Mon Dec 8 2008 Tom "spot" Callaway - 2.0.3-0.1.RC1 +- 2.0.3RC1 + * Tue May 27 2008 Tom "spot" Callaway - 2.0.2-4 - only try to use PowerISO as a converter on x86 platforms (bz 447214) diff --git a/sources b/sources index 8610dd4..cb77134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e38209ce6667da07f1182b02549eb6e2 acetoneiso2_2.0.2_source.tar.bz2 +ff03b123f3003b22ef2792f2cb8864ee acetoneiso_2.0.3RC1.tar.gz From 865bc524b693d4c2d14a3e2b37896b93311e1c63 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 8 Dec 2008 23:05:59 +0000 Subject: [PATCH 08/11] new patches --- ...neISO2-2.0.3-no-poweriso-for-non-x86.patch | 22 +++++++++++++++ acetoneiso2-2.0.3-desktop.patch | 28 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch create mode 100644 acetoneiso2-2.0.3-desktop.patch diff --git a/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch new file mode 100644 index 0000000..7eb954c --- /dev/null +++ b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch @@ -0,0 +1,22 @@ +diff -up acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h +--- acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD 2008-12-08 17:06:39.000000000 -0500 ++++ acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h 2008-12-08 17:18:00.000000000 -0500 +@@ -125,6 +125,7 @@ else { + void acetoneiso::get_poweriso() + { + QMessageBox msgBox; ++#if defined(__i386__) || defined(__x86_64__) + msgBox.setText(tr("Do you want to download Poweriso?\nIf you click yes you accept PowerISO's Freeware(proprietary but gratis) License.\nRemember: if you are running a 64-bit OS, you need ia32-libs package installed and maybe others.")); + msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); + switch (msgBox.exec()) { +@@ -145,6 +146,10 @@ msgBox.setText(tr("Do you want to downlo + // should never be reached + break; + } ++#else ++// Not a poweriso capable architecture ++QMessageBox::information(this, "AcetoneISO",tr("Poweriso is not available for this architecture.")); ++#endif + } + + diff --git a/acetoneiso2-2.0.3-desktop.patch b/acetoneiso2-2.0.3-desktop.patch new file mode 100644 index 0000000..45507fc --- /dev/null +++ b/acetoneiso2-2.0.3-desktop.patch @@ -0,0 +1,28 @@ +diff -up acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop +--- acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD 2008-12-08 17:01:11.000000000 -0500 ++++ acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop 2008-12-08 17:02:13.000000000 -0500 +@@ -1,21 +1,13 @@ + [Desktop Entry] +-Categories=Qt;KDE;Application;AudioVideo;DiscBurning; +-Comment= +-Comment[it]= ++Categories=Qt;KDE;AudioVideo;DiscBurning; + Encoding=UTF-8 + Exec=acetoneiso +-GenericName= +-GenericName[it]= +-Icon=/usr/share/pixmaps/Acetino2.png ++Icon=Acetino2 + MimeType=application/x-iso +-Name=AcetoneISO ++Name=AcetoneISO2 + GenericName= CD/DVD image manipulator + GenericName[it]= Strumenti per immagini CD/DVD +-Path= + StartupNotify=true + Terminal=false +-TerminalOptions= + Type=Application +-X-DCOP-ServiceType= + X-KDE-SubstituteUID=false +-X-KDE-Username= From f81c91934f070d016267a0b1ab02233b46d0fe0f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Apr 2009 14:02:27 +0000 Subject: [PATCH 09/11] 2.0.3 final --- ...neISO2-2.0.3-no-poweriso-for-non-x86.patch | 6 ++--- AcetoneISO2.spec | 22 +++++++++++-------- acetoneiso2-2.0.3-desktop.patch | 6 ++--- sources | 2 +- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch index 7eb954c..6186826 100644 --- a/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch +++ b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch @@ -1,6 +1,6 @@ -diff -up acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h ---- acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h.BAD 2008-12-08 17:06:39.000000000 -0500 -+++ acetoneiso_2.0.3RC1/acetoneiso/sources/converter.h 2008-12-08 17:18:00.000000000 -0500 +diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h +--- acetoneiso_2.0.3/src/sources/converter.h.BAD 2009-04-09 09:50:31.000000000 -0400 ++++ acetoneiso_2.0.3/src/sources/converter.h 2009-04-09 09:51:03.000000000 -0400 @@ -125,6 +125,7 @@ else { void acetoneiso::get_poweriso() { diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 762e280..9bfe65e 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,13 +1,11 @@ -%define prever RC1 - Name: AcetoneISO2 Version: 2.0.3 -Release: 0.1.%{prever}%{?dist} +Release: 1%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 URL: http://www.acetoneteam.org/ -Source0: http://www.acetoneteam.org/download/acetoneiso_%{version}%{prever}.tar.gz +Source0: http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz Patch0: acetoneiso2-2.0.3-desktop.patch Patch1: acetoneiso2-2.0.2-no-optdirs.patch Patch2: AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch @@ -24,7 +22,7 @@ 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 +- Play a DVD Movie ISO with most commonly-used media players - Generate an ISO from a Folder or CD/DVD - Generate/Check MD5 file of an image - Encrypt/decrypt an image @@ -34,19 +32,19 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: - Restore a lost CUE file of *.bin *.img %prep -%setup -q -n acetoneiso_%{version}%{prever} +%setup -q -n acetoneiso_%{version} %patch0 -p1 # %%patch1 -p1 %patch2 -p1 %build -cd acetoneiso/ +cd src/ qmake-qt4 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -cd acetoneiso +cd src/ make INSTALL_ROOT=$RPM_BUILD_ROOT install mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2 @@ -63,13 +61,19 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc AUTHORS CHANGELOG LICENSE README +%doc AUTHORS CHANGELOG FEATURES LICENSE README %{_bindir}/acetoneiso2 # %%{_datadir}/acetoneiso2 %{_datadir}/applications/AcetoneISO2.desktop %{_datadir}/pixmaps/Acetino2.png %changelog +* Thu Apr 9 2009 Tom "spot" Callaway - 2.0.3-1 +- update to 2.0.3 final + +* Mon Feb 23 2009 Fedora Release Engineering - 2.0.3-0.2.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 8 2008 Tom "spot" Callaway - 2.0.3-0.1.RC1 - 2.0.3RC1 diff --git a/acetoneiso2-2.0.3-desktop.patch b/acetoneiso2-2.0.3-desktop.patch index 45507fc..4135f8b 100644 --- a/acetoneiso2-2.0.3-desktop.patch +++ b/acetoneiso2-2.0.3-desktop.patch @@ -1,6 +1,6 @@ -diff -up acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop ---- acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop.BAD 2008-12-08 17:01:11.000000000 -0500 -+++ acetoneiso_2.0.3RC1/acetoneiso/menu/AcetoneISO.desktop 2008-12-08 17:02:13.000000000 -0500 +diff -up acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.3/src/menu/AcetoneISO.desktop +--- acetoneiso_2.0.3/src/menu/AcetoneISO.desktop.BAD 2009-04-09 09:48:36.000000000 -0400 ++++ acetoneiso_2.0.3/src/menu/AcetoneISO.desktop 2009-04-09 09:49:26.000000000 -0400 @@ -1,21 +1,13 @@ [Desktop Entry] -Categories=Qt;KDE;Application;AudioVideo;DiscBurning; diff --git a/sources b/sources index cb77134..fcf1eff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff03b123f3003b22ef2792f2cb8864ee acetoneiso_2.0.3RC1.tar.gz +8660f1675dd1544e2c8da21638706622 acetoneiso_2.0.3.tar.gz From b74315f6ec0ee89c9bc8cf7d96286c2a4a2f9fa9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:14 +0000 Subject: [PATCH 10/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c575906..7a648d2 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: AcetoneISO2 -# $Id$ +# $Id: Makefile,v 1.1 2008/04/09 15:36:15 spot Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e51a56d3fc66449748534014170bb37611054d2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:50 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7a648d2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: AcetoneISO2 -# $Id: Makefile,v 1.1 2008/04/09 15:36:15 spot Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9