Updated to release 1.0.1, rediffed P0, removed some cruft for older releases and avoided a couple of rpmlint errors

This commit is contained in:
Giovanni Mariani 2015-12-23 19:42:00 +01:00
parent 8fb2b99452
commit cba65580e8
4 changed files with 38 additions and 28 deletions

View file

@ -1,2 +1,4 @@
sources:
removed_sources:
synfig-1.0.tar.gz: 309db20d015c1b2b99eca80fbcd47b875c190b4c
sources:
synfig-1.0.1.tar.gz: 9f6e942a97f3bdbab6e96698ac53dee6dcff9391

View file

@ -1,12 +0,0 @@
diff -Naur synfig-1.0.orig/configure.ac synfig-1.0/configure.ac
--- synfig-1.0.orig/configure.ac 2015-05-15 00:12:55.000000000 +0400
+++ synfig-1.0/configure.ac 2015-05-15 00:12:55.000000000 +0400
@@ -47,8 +47,6 @@
# -- A R G U M E N T S ----------------------------------------
-AC_ARG_DEBUG
-AC_ARG_OPTIMIZATION
AC_ARG_WARNINGS
AC_ARG_PROFILING
AC_ARG_PROFILE_ARCS

12
synfig-1.0.1-cflags.patch Normal file
View file

@ -0,0 +1,12 @@
diff -rupN synfig-1.0.1.old/configure.ac synfig-1.0.1/configure.ac
--- synfig-1.0.1.old/configure.ac 2015-07-21 08:07:35.000000000 +0200
+++ synfig-1.0.1/configure.ac 2015-12-23 18:10:10.424235124 +0100
@@ -46,8 +46,6 @@ AC_C_BIGENDIAN
# -- A R G U M E N T S ----------------------------------------
-AC_ARG_OPTIMIZATION
-AC_ARG_DEBUG
AC_ARG_WARNINGS
AC_ARG_PROFILING
AC_ARG_PROFILE_ARCS

View file

@ -1,19 +1,19 @@
%define debug_package %{nil}
%define debug_package %{nil}
%define major 0
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
%define major 0
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
Summary: Vector-based 2D animation renderer
Name: synfig
Version: 1.0
Release: 2
Version: 1.0.1
Release: 1
License: GPLv3+
Group: Graphics
Url: http://www.synfig.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source100: %{name}.rpmlintrc
Patch0: %{name}-1.0-cflags.patch
Patch0: %{name}-1.0.1-cflags.patch
BuildRequires: cvs
BuildRequires: boost-devel
BuildRequires: ffmpeg-devel
@ -25,7 +25,7 @@ BuildRequires: pkgconfig(ETL) >= 0.4.18
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(GraphicsMagick++)
BuildRequires: pkgconfig(ImageMagick)
BuildRequires: pkgconfig(ImageMagick) >= 6.4.2
BuildRequires: pkgconfig(libmng)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml++-2.6)
@ -35,7 +35,7 @@ BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(pangocairo)
BuildRequires: pkgconfig(sigc++-2.0)
BuildRequires: automake
BuildRequires: automake1.4
#BuildRequires: automake1.4
BuildRequires: config(autoconf)
# Clang knows what the linker is? Sflo.
BuildRequires: gcc-c++, gcc, gcc-cpp
@ -100,24 +100,32 @@ by synfig.
%setup -q
%patch0 -p1
%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
# (gvm) Not found in configure.ac
#sed -i -e 's|Magick,OptimizeImageTransparency|MagickCore,OptimizeImageTransparency|g' configure.ac
# (gvm) Already changed in the source file
#sed -i -e 's|MagickLib::|MagickCore::|g' src/modules/mod_magickpp/trgt_magickpp.cpp
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 \
--with-imagemagick
# No more useful
#CXXFLAGS='-I /usr/include/ImageMagick' CFLAGS='-I /usr/include/ImageMagick' CPPFLAGS='-I /usr/include/ImageMagick'
%configure2_5x --disable-static
%make
%install
%makeinstall_std
# FIXME zh-Hant is not supported by Rosa language tree:
# remove offending lang file until we will support it
# and avoid 2 rpmlint errors
rm -rf %{buildroot}%{_datadir}/locale/zh-Hant
%find_lang %{name}