From 61ec9ca586a6f6179f7c05a226493d56b89c9f1a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:56:32 +0000 Subject: [PATCH 1/9] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 9c7feaffd9fcaa0efe45921c71744ed47289221b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 8 Dec 2008 23:00:36 +0000 Subject: [PATCH 2/9] 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 22504f82d561e04615449f145bf294b0d441dc41 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 8 Dec 2008 23:05:58 +0000 Subject: [PATCH 3/9] 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 f2f44d30fc0e0494d447405b1ec4aaac67938f59 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Apr 2009 14:02:26 +0000 Subject: [PATCH 4/9] 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 46513617dd0d4076868615ddedb5d058e55551cb Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 1 Jul 2009 21:03:27 +0000 Subject: [PATCH 5/9] 2.0.3.1 --- ...neISO2-2.0.3-no-poweriso-for-non-x86.patch | 4 +-- AcetoneISO2.spec | 23 ++++++++------- acetoneiso2-2.0.3.1-desktop.patch | 28 +++++++++++++++++++ sources | 2 +- 4 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 acetoneiso2-2.0.3.1-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 index 6186826..451f9dc 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.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 +--- 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() { diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 9bfe65e..ed24738 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,16 +1,15 @@ Name: AcetoneISO2 -Version: 2.0.3 +Version: 2.0.3.1 Release: 1%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 URL: http://www.acetoneteam.org/ -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 -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}.zip +Patch0: acetoneiso2-2.0.3.1-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 @@ -32,19 +31,16 @@ 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} +%setup -q -n AcetoneISO_%{version} %patch0 -p1 -# %%patch1 -p1 -%patch2 -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 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2 @@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Wed Jul 1 2009 Tom "spot" Callaway - 2.0.3.1-1 +- update to 2.0.3.1 + * Thu Apr 9 2009 Tom "spot" Callaway - 2.0.3-1 - update to 2.0.3 final diff --git a/acetoneiso2-2.0.3.1-desktop.patch b/acetoneiso2-2.0.3.1-desktop.patch new file mode 100644 index 0000000..6e952fc --- /dev/null +++ b/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= diff --git a/sources b/sources index fcf1eff..ca08b7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8660f1675dd1544e2c8da21638706622 acetoneiso_2.0.3.tar.gz +437d373e8ef74baaaa3676f37b56054d AcetoneISO_2.0.3.1.zip From 47b5ef8d27a44afaf27206678ea4e00b6fa0b001 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 23 Jul 2009 22:38:08 +0000 Subject: [PATCH 6/9] 2.0.3.2 --- AcetoneISO2.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index ed24738..6234c2b 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,12 +1,12 @@ Name: AcetoneISO2 -Version: 2.0.3.1 +Version: 2.0.3.2 Release: 1%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 URL: http://www.acetoneteam.org/ -Source0: http://download.sourceforge.net/sourceforge/acetoneiso2/AcetoneISO_%{version}.zip -Patch0: acetoneiso2-2.0.3.1-desktop.patch +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 @@ -31,7 +31,7 @@ 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} +%setup -q -n Acetoneiso_%{version} %patch0 -p1 %patch1 -p1 @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Thu Jul 23 2009 Tom "spot" Callaway - 2.0.3.2-1 +- update to 2.0.3.2 + * Wed Jul 1 2009 Tom "spot" Callaway - 2.0.3.1-1 - update to 2.0.3.1 diff --git a/sources b/sources index ca08b7b..4f84822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -437d373e8ef74baaaa3676f37b56054d AcetoneISO_2.0.3.1.zip +4d6724e134280f8d1b92f4b9fb1579f7 Acetoneiso_2.0.3.2.tar.gz From 574e9de7d9c18a21bd77778de1339d7de48f8fa4 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 23 Jul 2009 23:06:32 +0000 Subject: [PATCH 7/9] forgot to tag some files --- AcetoneISO2.spec | 5 ++++- acetoneiso2-2.0.3.2-desktop.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 acetoneiso2-2.0.3.2-desktop.patch diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 6234c2b..c35ba5d 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,6 +1,6 @@ Name: AcetoneISO2 Version: 2.0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Thu Jul 23 2009 Tom "spot" Callaway - 2.0.3.2-2 +- forgot to tag some files + * Thu Jul 23 2009 Tom "spot" Callaway - 2.0.3.2-1 - update to 2.0.3.2 diff --git a/acetoneiso2-2.0.3.2-desktop.patch b/acetoneiso2-2.0.3.2-desktop.patch new file mode 100644 index 0000000..a9ef1a8 --- /dev/null +++ b/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 From a92e5ea76276e4dbc85d2ab9cb702887f7b7f702 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:13 +0000 Subject: [PATCH 8/9] 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 9b7be3d45a2cff52f08cf4dbf8cf450a5ba079a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:47 +0000 Subject: [PATCH 9/9] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10