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

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 523d87035dbadfc42f04b139a2bfa9469d147d9f..d8400eef9cb59a82432ced4ef78a59efc8f12012 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_with    dps             # build DPS coder (uses libdps removed from X11R7)
 %bcond_without fpx             # without FlashPIX module (which uses fpx library)
 %bcond_without graphviz        # without Graphviz support
 %bcond_with    gs              # with PostScript support through ghostscript library (warning: breaks jpeg!)
@@ -9,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
@@ -23,19 +22,19 @@ Summary(tr):        X alt
 Summary(uk):   ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä X Window
 Name:          ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       2
+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
 Patch2:                %{name}-system-libltdl.patch
+Patch3:                %{name}-link.patch
 URL:           http://www.imagemagick.org/
-%{?with_dps:BuildRequires:     XFree86-DPS-devel}
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1:1.9
 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: expat-devel >= 1.95.7
@@ -57,17 +56,17 @@ 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-libSM
 BuildRequires: xorg-lib-libXext
-BuildRequires: xorg-lib-libXt
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     ImageMagick-coder-dps
 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
@@ -164,9 +163,7 @@ Requires:   lcms-devel
 Requires:      libjpeg-devel
 Requires:      libltdl-devel
 Requires:      libtiff-devel
-Requires:      xorg-lib-libSM-devel
 Requires:      xorg-lib-libXext-devel
-Requires:      xorg-lib-libXt-devel
 Requires:      zlib-devel
 
 %description devel
@@ -391,20 +388,6 @@ Coder module for GraphViz DOT files.
 %description coder-dot -l pl
 Modu³ kodera dla plików GraphViz DOT.
 
-%package coder-dps
-Summary:       Coder module for Postscript files using DPS extension
-Summary(pl):   Modu³ kodera dla plików Postscript u¿ywaj±cy rozszerzenia DPS
-Group:         X11/Applications/Graphics
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description coder-dps
-Coder module for Postcript files using DPS (Display PostScript)
-extension.
-
-%description coder-dps -l pl
-Modu³ kodera dla plików Postscript u¿ywaj±cy rozszerzenia DPS (Display
-PostScript).
-
 %package coder-fpx
 Summary:       Coder module for FlashPIX (FPX) files
 Summary(pl):   Modu³ kodera dla plików FlashPIX (FPX)
@@ -569,6 +552,7 @@ Modu
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
 find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
@@ -586,6 +570,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        --enable-lzw \
        --enable-shared \
        --disable-ltdl-install \
+       --without-dps \
        --with%{!?with_graphviz:out}-dot \
        --with%{!?with_fpx:out}-fpx \
        --with%{!?with_gs:out}-gslib \
@@ -829,14 +814,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/dot.so
 %{modulesdir}/coders/dot.la
 
-%if %{with dps}
-%files coder-dps
-%defattr(644,root,root,755)
-# R: XFree86-DPS (libdps.so)
-%attr(755,root,root) %{modulesdir}/coders/dps.so
-%{modulesdir}/coders/dps.la
-%endif
-
 %if %{with fpx}
 %files coder-fpx
 %defattr(644,root,root,755)