diff --git a/.cvsignore b/.cvsignore index c4780e4..8fbfa91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acetoneiso2_2.0.1-source.tar.gz +acetoneiso2_2.0.2_source.tar.bz2 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