Updated to release 1.2.0 and dropped P2 (merged upstream)

.abf.yml

@@ -2,4 +2,4 @@ removed_sources:
   synfig-1.0.1.tar.gz: 9f6e942a97f3bdbab6e96698ac53dee6dcff9391
   synfig-1.0.tar.gz: 309db20d015c1b2b99eca80fbcd47b875c190b4c
 sources:
-  synfig-1.0.2.tar.gz: bf3df0f091400809d18e243213b72acc213598dc
+  synfig-1.2.0.tar.gz: 15ca82e44f27c851bfc223791b3b4d6a023d44c3

synfig.spec

@@ -6,8 +6,8 @@
 
 Summary:	Vector-based 2D animation renderer
 Name:		synfig
-Version:	1.0.2
-Release:	4
+Version:	1.2.0
+Release:	1
 License:	GPLv3+
 Group:		Graphics
 Url:		http://www.synfig.org
@@ -15,14 +15,18 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source100:	%{name}.rpmlintrc
 Patch0:		synfig-1.0.1-cflags.patch
 Patch1:		synfig-1.0.2-configure.patch
-Patch2:		synfig-1.0.2-std-cxx11.patch
+BuildRequires:	automake
+#BuildRequires:	automake1.4
+BuildRequires:	config(autoconf)
 BuildRequires:	cvs
 BuildRequires:	boost-devel >= 1.53.0
 BuildRequires:	ffmpeg-devel
 BuildRequires:	gettext-devel
 BuildRequires:	jpeg-devel
 BuildRequires:	libltdl-devel
-BuildRequires:	pkgconfig(ETL) >= 0.4.19
+BuildRequires:	pkgconfig(cairo) >= 1.12.0
+BuildRequires:	pkgconfig(ETL) >= 0.4.22
+BuildRequires:	pkgconfig(fftw3)
 BuildRequires:	pkgconfig(fontconfig)
 BuildRequires:	pkgconfig(freetype2)
 BuildRequires:	pkgconfig(giomm-2.4) >= 2.18.2
@@ -34,21 +38,15 @@ BuildRequires:	pkgconfig(libpng)
 BuildRequires:	pkgconfig(libxml++-2.6)
 BuildRequires:	pkgconfig(mlt++)
 BuildRequires:	pkgconfig(OpenEXR)
-BuildRequires:	pkgconfig(cairo) >= 1.12.0
 BuildRequires:	pkgconfig(pango)
 BuildRequires:	pkgconfig(pangocairo)
 BuildRequires:	pkgconfig(sigc++-2.0)
-BuildRequires:	automake
-#BuildRequires:	automake1.4
-BuildRequires:	config(autoconf)
-# Clang knows what  the linker is? Sflo.
-BuildRequires:	gcc-c++, gcc, gcc-cpp
-
+Requires:	ffmpeg
 Requires:	libdv-apps
 Requires:	imagemagick
 Requires:	x11-font-cursor-misc
 Requires:	x11-font-misc
-Requires:	ffmpeg
+
 
 %description
 synfig is a vector based 2D animation renderer. It is designed to be capable
@@ -104,22 +102,20 @@ by synfig.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 
 %build
 export CC=gcc
 export CXX=g++
-
-aclocal -I m4
-automake --add-missing
-autoconf -i --force
-
-export CXXFLAGS="%{optflags} -std=gnu++11"
+autoreconf -vfi
+# FIXME Enabling magickpp makes the build fail:
+# 'GetExceptionInfo' is not a member of 'MagickCore'
 %configure2_5x \
 	--disable-static \
 	--without-magickpp
 %make
 
+
 %install
 %makeinstall_std