From 3da6e4415bba25c5e6b10d804fe1116cdb12f828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Tue, 29 Sep 2009 16:10:22 +0000 Subject: [PATCH 1/5] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From e5199ab5c359ca37e8ec0d1ad8ab92dce53e3776 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 5 Nov 2009 21:53:19 +0000 Subject: [PATCH 2/5] 2.2.1 --- .cvsignore | 2 +- AcetoneISO2.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2afd503..c69544a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acetoneiso_2.1.1.tar.gz +acetoneiso_2.2.1.tar.gz diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index 7f7cb8e..ac60dfc 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,5 +1,5 @@ Name: AcetoneISO2 -Version: 2.1.1 +Version: 2.2.1 Release: 1%{?dist} Summary: CD/DVD Image Manipulator Group: Applications/Archiving @@ -10,6 +10,7 @@ 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 +BuildRequires: phonon-devel Requires: p7zip, cdrdao Requires: fuseiso, fuse, genisoimage Requires: gnupg, pinentry-qt @@ -37,8 +38,8 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following: %build cd acetoneiso -qmake-qt4 -make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS" +qmake-qt4 "QMAKE_CXXFLAGS=$RPM_OPT_FLAGS -I/usr/include/KDE" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -66,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/Acetino2.png %changelog +* Thu Nov 5 2009 Tom "spot" Callaway - 2.2.1-1 +- update to 2.2.1 + * Wed Sep 16 2009 Tom "spot" Callaway - 2.1.1-1 - update to 2.1.1 diff --git a/sources b/sources index fd643da..773cecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72e41e912e514946152fb9bcac1924b7 acetoneiso_2.1.1.tar.gz +c4891fb1ddfe9d3dff4b55e8ea27ed29 acetoneiso_2.2.1.tar.gz From 6b5f2de9e29efd5d3b1461371495ef18ccf68c34 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:16:13 +0000 Subject: [PATCH 3/5] 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 0732c4c0c752a336ab6dcc56fdfdc9d185b06891 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 28 Jun 2010 18:29:26 +0000 Subject: [PATCH 4/5] update to 2.2.2 --- AcetoneISO2.spec | 25 +++++++++++++++++++------ sources | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec index ac60dfc..038d5d1 100644 --- a/AcetoneISO2.spec +++ b/AcetoneISO2.spec @@ -1,15 +1,19 @@ Name: AcetoneISO2 -Version: 2.2.1 -Release: 1%{?dist} +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,15 @@ 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) + * Thu Nov 5 2009 Tom "spot" Callaway - 2.2.1-1 - update to 2.2.1 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 d84dc6fd252c900e179f726e90d64a7c1d61b06f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:45:46 +0000 Subject: [PATCH 5/5] 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12