From da045c9e3ff5966716aa63f249f4dc70338ead9e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:39 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 6fb8781f4c44d3293bba2922b46fe17f45d0648a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 28 Jun 2010 18:29:26 +0000 Subject: [PATCH 2/4] update to 2.2.2 --- AcetoneISO2.spec | 20 +++++++++++++++----- sources | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 66f1643..038d5d1 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,15 +1,19 @@ Name: AcetoneISO2 -Version: 2.2.1 +Version: 2.2.2 Release: 2%{?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.2-desktop.patch +Source0: http://download.sourceforge.net/sourceforge/acetoneiso/acetoneiso_%{version}.tar.gz 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 +BuildRequires: kdewebdev-devel, desktop-file-utils +%if 0%{?fedora} > 13 +BuildRequires: qt-webkit-devel +%else +BuildRequires: qt4-devel +%endif BuildRequires: phonon-devel Requires: p7zip, cdrdao Requires: fuseiso, fuse, genisoimage @@ -33,7 +37,6 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: %prep %setup -q -n acetoneiso_%{version} -%patch0 -p1 %patch1 -p1 %build @@ -49,6 +52,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_ 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 +sed -i 's|Name=AcetoneISO|Name=AcetoneISO2|g' $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -67,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Mon Jun 28 2010 Tom "spot" Callaway - 2.2.2-2 +- fix qt buildrequires + +* Mon Jun 28 2010 Tom "spot" Callaway - 2.2.2-1 +- update to 2.2.2 + * Tue Nov 24 2009 Kevin Kofler - 2.2.1-2 - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) diff --git a/sources b/sources index 773cecb..580f0bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4891fb1ddfe9d3dff4b55e8ea27ed29 acetoneiso_2.2.1.tar.gz +5d7110659edcd2d69ad91300f2f21dc5 acetoneiso_2.2.2.tar.gz From 537b58dc56fb80c09e4d900f4f6762fdf15d5aaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:45 +0000 Subject: [PATCH 3/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 265de40c82021af0af04f1e9330f8173d911c28a Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Thu, 18 Nov 2010 10:09:32 -0500 Subject: [PATCH 4/4] update to 2.3 --- AcetoneISO2.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 038d5d1..0b2f6c0 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,6 +1,6 @@ Name: AcetoneISO2 -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.3 +Release: 1%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving License: GPLv3 @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Thu Nov 18 2010 Tom "spot" Callaway - 2.3-1 +- update to 2.3 + * Mon Jun 28 2010 Tom "spot" Callaway - 2.2.2-2 - fix qt buildrequires diff --git a/sources b/sources index 580f0bc..8e3076e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d7110659edcd2d69ad91300f2f21dc5 acetoneiso_2.2.2.tar.gz +225f7af687016690ff28b9771a1ce179 acetoneiso_2.3.tar.gz