- 6.2.9-1 (http://securitytracker.com/id?1016699)

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index eb05706939fe8b472a3ab53adb661eea891cba17..d8400eef9cb59a82432ced4ef78a59efc8f12012 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -8,8 +8,8 @@
 %bcond_without cxx             # without Magick++
 #
 %include       /usr/lib/rpm/macros.perl
-%define                ver 6.2.6
-%define                pver    0
+%define                ver 6.2.9
+%define                pver    1
 %define                QuantumDepth    16
 Summary:       Image display, conversion, and manipulation under X
 Summary(de):   Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -22,12 +22,12 @@ Summary(tr):        X alt
 Summary(uk):   ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä X Window
 Name:          ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       3
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: 4ff40a92bba825d8cb9447ca454698a0
+# Source0-md5: 44cdd1e43b91c0def38edf4a0b8a01ed
 #Source0:      http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-ac.patch
@@ -56,6 +56,7 @@ BuildRequires:        libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.315
 # only checked for, but only supplied scripts/txt2html is used
 #BuildRequires:        txt2html
 BuildRequires: xorg-lib-libXext
@@ -65,7 +66,7 @@ Obsoletes:    ImageMagick-coder-mpeg
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # we don't want "-s" here, because it would be added to `Magick*-config --ldflags`
-%define                rpmldflags      %{nil}
+%define                filterout_ld    (-Wl,)?-s (-Wl,)?--strip-all
 %define                modulesdir      %{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
 
 %description