dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-acetoneiso_2.1.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+acetoneiso_2.2.1.tar.gz

AcetoneISO2.spec

@@ -1,15 +1,20 @@
 Name:		AcetoneISO2
-Version:	2.1.1
+Version:	2.2.2
-Release:	1%{?dist}
+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
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso/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
+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
 Requires:	gnupg, pinentry-qt
@@ -32,13 +37,12 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following:
 
 %prep
 %setup -q -n acetoneiso_%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
 cd acetoneiso
-qmake-qt4
+qmake-qt4 "QMAKE_CXXFLAGS=$RPM_OPT_FLAGS -I/usr/include/KDE"
-make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT 
@@ -48,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	\
@@ -66,6 +71,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Mon Jun 28 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.2-2
+- fix qt buildrequires
+
+* Mon Jun 28 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.2-1
+- update to 2.2.2
+
+* Tue Nov 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 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 <tcallawa@redhat.com> - 2.2.1-1
+- update to 2.2.1
+
 * Wed Sep 16 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.1.1-1
 - update to 2.1.1
 

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)

sources

@@ -1 +1 @@
-72e41e912e514946152fb9bcac1924b7  acetoneiso_2.1.1.tar.gz
+5d7110659edcd2d69ad91300f2f21dc5  acetoneiso_2.2.2.tar.gz