[synfig/f14/master: 2/2] fix spec

[Luya Tshimbalanga]

commit 71810cccd9ff9de0a4274ddfd3cc77ebcc85ab40
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Fri Sep 10 10:44:19 2010 -0700

    fix spec

 synfig.spec |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/synfig.spec b/synfig.spec
index 1b2109b..b86b755 100644
--- a/synfig.spec
+++ b/synfig.spec
@@ -1,11 +1,6 @@
 Name:           synfig
-<<<<<<< .merge_file_7wkZnh
 Version:        0.62.01
 Release:        1%{?dist}
-=======
-Version:        0.62.00
-Release:        1%{?dist}.2
->>>>>>> .merge_file_BS7ZX3
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -16,11 +11,7 @@ Patch0:         synfig-0.61.09-optflags.patch
 Patch1:         synfig-0.62.00-ltld.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-<<<<<<< .merge_file_7wkZnh
 BuildRequires:  ETL-devel >= 0.04.13
-=======
-BuildRequires:  ETL-devel
->>>>>>> .merge_file_BS7ZX3
 BuildRequires:  libxml++-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
@@ -74,13 +65,9 @@ rm -rf libltdl
 
 
 %build
-<<<<<<< .merge_file_7wkZnh
 aclocal -I m4
 automake
 autoconf -i --force
-=======
-sed 's/0.04.13/0.04.12/g' -i configure
->>>>>>> .merge_file_BS7ZX3
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -130,7 +117,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< .merge_file_7wkZnh
 * Sat Sep 4 2010 Luya Tshimbalanga <luya at fedoraproject.org> - 0.62.01-1
 - New upstream release
 
@@ -139,9 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 - Drop bundled libltdl
 
 * Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
-=======
-* Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.2
->>>>>>> .merge_file_BS7ZX3
 - Work around a segfault w/o urw-fonts
 
 * Mon Dec 7 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1.1