[synfig] updated spec

[Luya Tshimbalanga]

commit 960a7d10b14a5e9b01606e2e59d65488b1e87e2f
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Fri Sep 10 10:06:37 2010 -0700

    updated spec

 .gitignore  |    3 +++
 sources     |    4 ++++
 synfig.spec |   20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 413cb21..19f623b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 synfig-0.62.00.tar.gz
+<<<<<<< .merge_file_SbiYMZ
 /synfig-0.62.01.tar.gz
+=======
+>>>>>>> .merge_file_E8BsIN
diff --git a/sources b/sources
index 2f0655b..0e17711 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< .merge_file_lEN3R0
 5f033052b88b34e99259a58cfcf1a283  synfig-0.62.01.tar.gz
+=======
+773f3507c9fa5dfc084ad7e38a08a33f  synfig-0.62.00.tar.gz
+>>>>>>> .merge_file_bhK7K3
diff --git a/synfig.spec b/synfig.spec
index 2a4ec86..1b2109b 100644
--- a/synfig.spec
+++ b/synfig.spec
@@ -1,6 +1,11 @@
 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
@@ -11,7 +16,11 @@ 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
@@ -65,9 +74,13 @@ 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
@@ -117,6 +130,7 @@ 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
 
@@ -125,8 +139,14 @@ 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
+- Build with older ETL
+
 * Sat Nov 14 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-1
 - New upstream release