Updated to 0.64.3, fix requirements, sync with cooker

This commit is contained in:
Denis Silakov 2015-03-28 11:24:22 +04:00
parent 771b040dae
commit 126691abae
3 changed files with 42 additions and 23 deletions

View file

@ -1,2 +1,5 @@
removed_sources:
synfig-0.63.05.tar.gz: d532b8dd37a7eed10ea5de6f5b2b2dd419648f2c
synfig-0.64.0.tar.gz: b33a4b4eeb957aa141df156ebf9e397fe4bf1503
sources:
synfig-0.64.1.tar.gz: 19fe81f144100c3f5e14a1b88b26a9b659fee3b8
synfig-0.64.3.tar.gz: 868e55dcac9ecda93c6f4aa2d842713f5b77df8d

View file

@ -4,3 +4,6 @@ addFilter("W: no-manual-page-for-binary")
# False positive: the libdv-apps required by synfig
# it is *not* a library package
addFilter("E: explicit-lib-dependency")
# bullshitting the linting, EVRD macros not really works, about the rel... no comment .Sflo
addFilter("E: no-dependency-on")
addFilter("W: not-standard-release-extension")

View file

@ -1,41 +1,50 @@
%define major 0
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
%define major 0
%define libname %mklibname %{name} %{major}
%define develname %mklibname %{name} -d
%define debug_package %{nil}
Summary: Vector-based 2D animation renderer
Name: synfig
Version: 0.64.1
Release: 4
License: GPLv3+
Summary: Vector-based 2D animation renderer
Version: 0.64.3
Release: 1
License: GPLv3
Group: Graphics
Url: http://www.synfig.org
URL: http://www.synfig.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source100: %{name}.rpmlintrc
Patch0: %{name}-0.63.05-cflags.patch
Patch1: synfig-0.64.0-libpng1.6.patch
# Pulfer's patch from the enemy distro.Sflo
# Patch1: synfig-0.64.0-libpng1.6.patch
BuildRequires: cvs
BuildRequires: boost-devel
BuildRequires: ffmpeg-devel
BuildRequires: gettext-devel
BuildRequires: jpeg-devel
BuildRequires: libltdl-devel
BuildRequires: mng-devel
BuildRequires: pkgconfig(libmng)
BuildRequires: boost-devel
BuildRequires: pkgconfig(ETL) >= 0.4.16
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(ETL) >= 0.4.17
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangocairo)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(ImageMagick)
BuildRequires: pkgconfig(GraphicsMagick++)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml++-2.6)
BuildRequires: pkgconfig(OpenEXR)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangocairo)
BuildRequires: pkgconfig(sigc++-2.0)
Requires: ffmpeg
BuildRequires: automake
BuildRequires: automake1.4
BuildRequires: config(autoconf)
# Clang knows what the linker is? Sflo.
BuildRequires: gcc-c++, gcc, gcc-cpp
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
@ -66,19 +75,19 @@ This package contains the shared library provided by synfig.
#-----------------------------------------------------------------------------
%package -n %{devname}
%package -n %{develname}
Summary: Development headers and libraries for %{name}
Group: Development/C++
Requires: %{libname} = %{EVRD}
Provides: %{name}-devel = %{EVRD}
Requires: %{libname} = %{EVRD}
%description -n %{devname}
%description -n %{develname}
synfig is a vector based 2D animation renderer. It is designed to be capable
of producing feature-film quality animation.
This package contains the development files for the shared library provided
by synfig.
%files -n %{devname}
%files -n %{develname}
%doc COPYING ChangeLog NEWS
%{_bindir}/%{name}-config
%{_includedir}/%{name}-*
@ -90,14 +99,19 @@ by synfig.
%prep
%setup -q
%patch0 -p1
%patch1 -p0
#patch1 -p0
%build
export CC=gcc
export CXX=g++
# These two fix for the split of libMagick in recent releases - AdamW
sed -i -e 's|Magick,OptimizeImageTransparency|MagickCore,OptimizeImageTransparency|g' configure.ac
sed -i -e 's|MagickLib::|MagickCore::|g' src/modules/mod_magickpp/trgt_magickpp.cpp
autoreconf -fi
aclocal -I m4
automake --add-missing
autoconf -i --force
CXXFLAGS='-I /usr/include/ImageMagick' CFLAGS='-I /usr/include/ImageMagick' CPPFLAGS='-I /usr/include/ImageMagick'
%configure2_5x \
--disable-static \
@ -109,4 +123,3 @@ CXXFLAGS='-I /usr/include/ImageMagick' CFLAGS='-I /usr/include/ImageMagick' CPPF
%makeinstall_std
%find_lang %{name}