- rel 8

[packages/gd.git] / gd.spec

diff --git a/gd.spec b/gd.spec
index ae1d0754349f98051b3d498d77bd892f57d29efa..11fa341cfb88d37e9bbc42e6612937d44d4ff9a7 100644 (file)
--- a/gd.spec
+++ b/gd.spec
@@ -8,24 +8,28 @@ Summary(es):  Biblioteca para manipulaci
 Summary(pl):   Biblioteka do tworzenia grafiki w formacie PNG, JPEG
 Summary(pt_BR):        Biblioteca para manipulação de imagens
 Name:          gd
-Version:       2.0.31
-Release:       2
+Version:       2.0.33
+Release:       8
 License:       BSD-like
 Group:         Libraries
 Source0:       http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
-# Source0-md5: 3a6e508f7911458151fe4a1475cbba51
+# Source0-md5: be0a6d326cd8567e736fbc75df0a5c45
 Patch0:                %{name}-fontpath.patch
 Patch1:                %{name}-rotate_from_php.patch
+Patch2:                %{name}-graphviz.patch
+Patch3:                %{name}-SetAAPixel.patch
+Patch4:                %{name}-security.patch
 URL:           http://www.boutell.com/gd/
-%{?with_xpm:BuildRequires:     XFree86-devel}
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
 %{?with_fontconfig:BuildRequires:      fontconfig-devel}
 BuildRequires: freetype-devel >= 2.0
+BuildRequires: gettext-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.3
+%{?with_xpm:BuildRequires:     xorg-lib-libXpm}
 BuildRequires: zlib-devel
 Provides:      gd(gif) = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,11 +74,11 @@ Summary(pl):        Cz
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para desenvolver programas usando gd
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%{?with_xpm:Requires:  XFree86-devel}
 Requires:      fontconfig-devel
 Requires:      freetype-devel >= 2.0
 Requires:      libjpeg-devel
 Requires:      libpng-devel
+%{?with_xpm:Requires:  xorg-lib-libXpm}
 Requires:      zlib-devel
 Provides:      gd-devel(gif) = %{version}-%{release}
 
@@ -138,9 +142,12 @@ para uso pelos programas que usam a libgd.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
-# hack to avoid inclusion of -s or -L/usr/%{_lib} in --ldflags
-%{__perl} -pi -e 's,\@LDFLAGS\@,-L/usr/X11R6/%{_lib},g' config/gdlib-config.in
+# hack to avoid inclusion of -s in --ldflags
+%{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
 
 %build
 %{__libtoolize}