dist-git conversion

#2781)

AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch

@@ -0,0 +1,22 @@
+diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
+--- acetoneiso_2.0.3/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.3/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
+@@ -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
+ }
+ 
+ 

AcetoneISO2.spec

@@ -1,16 +1,15 @@
 Name:		AcetoneISO2
-Version:	2.0.2
-Release:	4%{?dist}
+Version:	2.0.3.2
+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.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
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/Acetoneiso_%{version}.tar.gz
+Patch0:		acetoneiso2-2.0.3.2-desktop.patch
+Patch1:		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
 Requires:	fuseiso, fuse, genisoimage
 Requires:	gnupg, pinentry-qt
@@ -22,32 +21,31 @@ 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
 - 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}
 %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
+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	\
@@ -59,15 +57,31 @@ 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}/acetoneiso2
 %{_datadir}/applications/AcetoneISO2.desktop
 %{_datadir}/pixmaps/Acetino2.png
-%{_datadir}/apps/konqueror/servicemenus/acetoneiso2-*
-%{_datadir}/apps/d3lphin/servicemenus/acetoneiso2-*
 
 %changelog
+* Thu Jul 23 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3.2-2
+- forgot to tag some files
+
+* Thu Jul 23 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3.2-1
+- update to 2.0.3.2
+
+* Wed Jul  1 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3.1-1
+- update to 2.0.3.1
+
+* Thu Apr  9 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3-1
+- update to 2.0.3 final
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec  8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.3-0.1.RC1
+- 2.0.3RC1
+
 * Tue May 27 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.2-4
 - only try to use PowerISO as a converter on x86 platforms (bz 447214)
 

Makefile

@@ -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)

acetoneiso2-2.0.3-desktop.patch

@@ -0,0 +1,28 @@
+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;
+-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=

acetoneiso2-2.0.3.1-desktop.patch

@@ -0,0 +1,28 @@
+diff -up AcetoneISO_2.0.3.1/menu/AcetoneISO.desktop.BAD AcetoneISO_2.0.3.1/menu/AcetoneISO.desktop
+--- AcetoneISO_2.0.3.1/menu/AcetoneISO.desktop.BAD	2009-07-01 16:50:39.435697554 -0400
++++ AcetoneISO_2.0.3.1/menu/AcetoneISO.desktop	2009-07-01 16:51:14.541708350 -0400
+@@ -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=

acetoneiso2-2.0.3.2-desktop.patch

@@ -0,0 +1,15 @@
+diff -up Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop
+--- Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD	2009-07-23 18:30:22.496042966 -0400
++++ Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop	2009-07-23 18:30:43.351041731 -0400
+@@ -2,9 +2,9 @@
+ Categories=Qt;KDE;Application;AudioVideo;DiscBurning;
+ Encoding=UTF-8
+ Exec=acetoneiso
+-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
+ GenericName[de]=CD/DVD-Abbildmanager

sources

@@ -1 +1 @@
-e38209ce6667da07f1182b02549eb6e2  acetoneiso2_2.0.2_source.tar.bz2
+4d6724e134280f8d1b92f4b9fb1579f7  Acetoneiso_2.0.3.2.tar.gz