Author: goetz
Date: Fri Feb 16 14:43:11 2007
New Revision: 121701
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.0.1-includedir.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.7-windows-fontdir.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.5-fix-montageimages-test.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-docdir.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-libname.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-5.tar.bz2
(contents, props changed)
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-fpx.patch
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-urw.patch
Removed:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-5.2.1-tv.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.0.1-includedir.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.7-type-urw.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.7-windows-fontdir.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.5-fix-montageimages-test.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-docdir.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-fpxdeps.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-libname.patch.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-8.tar.bz2
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.9-CVE-2006-5456.patch
Modified:
packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec
Log:
- new version
- new major
- drop patches 1, 21
- rediff patch 17
- fix patch 7, it was producing invalid xml in a font configuration file
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.0.1-includedir.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.0.1-includedir.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,11 @@
+--- ImageMagick-6.0.1/magick/Magick-config.in.include 2003-11-13
18:33:26.000000000 +0100
++++ ImageMagick-6.0.1/magick/Magick-config.in 2004-06-02 18:04:36.868955278
+0200
+@@ -31,7 +31,7 @@
+ echo '@MAGICK_CFLAGS@'
+ ;;
+ --cppflags)
+- echo '@MAGICK_CPPFLAGS@'
++ echo '@CPPFLAGS@'
+ ;;
+ --ldflags)
+ echo '@MAGICK_LDFLAGS@'
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.7-windows-fontdir.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.1.7-windows-fontdir.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,53 @@
+--- ImageMagick-6.1.7/configure.ac~ 2005-01-06 17:18:10.184532260 +0100
++++ ImageMagick-6.1.7/configure.ac 2005-01-06 17:18:10.185532595 +0100
+@@ -2145,24 +2145,6 @@
+ #
+ type_include_files=''
+
+-# Windows
+-windows_font_dir=''
+-if test "$with_windows_font_dir" != "yes" && test -n "$with_windows_font_dir"
+-then
+- windows_font_dir="${with_windows_font_dir}/"
+-fi
+-if test -n "$windows_font_dir"
+-then
+- if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'
+- then
+- windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/'
+- fi
+-fi
+-if test -n "$windows_font_dir"
+-then
+- type_include_files="$type_include_files "'<include file="type-windows.xml"
/>'
+-fi
+-AC_SUBST(windows_font_dir)
+
+ # Adobe Postscript fonts on various systems
+ case $host_os in
+@@ -2221,6 +2203,25 @@
+
+ AC_SUBST(type_include_files)
+
++# Windows
++windows_font_dir=''
++if test "$with_windows_font_dir" != "yes" && test -n "$with_windows_font_dir"
++then
++ windows_font_dir="${with_windows_font_dir}/"
++fi
++if test -n "$windows_font_dir"
++then
++ if test -f '/usr/X11R6/lib/X11/fonts/truetype/arial.ttf'
++ then
++ windows_font_dir='/usr/X11R6/lib/X11/fonts/truetype/'
++ fi
++fi
++if test -n "$windows_font_dir"
++then
++ type_include_files="$type_include_files "'<include file="type-windows.xml"
/>'
++fi
++AC_SUBST(windows_font_dir)
++
+ #
+ # Handle case where user doesn't want frozen paths
+ #
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.5-fix-montageimages-test.patch
==============================================================================
--- (empty file)
+++
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.5-fix-montageimages-test.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,14 @@
+--- ImageMagick-6.2.5/magick/gem.c.bak 2005-10-08 20:27:52.000000000 +0200
++++ ImageMagick-6.2.5/magick/gem.c 2006-01-20 21:09:26.499246690 +0100
+@@ -1025,7 +1025,10 @@
+ *saturation=(double) (1.0-min/max);
+ delta=max-min;
+ if (delta == 0.0)
+- return;
++ {
++ *hue=0.0;
++ return;
++ }
+ if ((MagickRealType) red == max)
+ *hue=(double) ((green-(MagickRealType) blue)/delta);
+ else
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-docdir.patch
==============================================================================
--- (empty file)
+++ packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-docdir.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,11 @@
+--- ImageMagick-6.2.7/configure.ac~ 2006-04-18 12:08:11.000000000 +0200
++++ ImageMagick-6.2.7/configure.ac 2006-04-18 12:38:06.000000000 +0200
+@@ -2059,7 +2059,7 @@
+
+ #
+ # Path to ImageMagick document files
+-MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickDocumentSubdir="${PACKAGE_NAME}-doc-${PACKAGE_VERSION}"
+ MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
+ MagickDocumentPathDefine="${MagickDocumentPath}/"
+ if test "$native_win32_build" = 'yes'
Added:
packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-libname.patch
==============================================================================
--- (empty file)
+++ packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.2.7-libname.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,44 @@
+--- ImageMagick-6.2.7/Magick++/Makefile.am.libname 2006-02-21
04:23:09.000000000 +0100
++++ ImageMagick-6.2.7/Magick++/Makefile.am 2006-04-18 10:13:07.000000000
+0200
+@@ -139,7 +139,7 @@
+ Magick++/lib/Magick++/TypeMetric.h
+
+ Magick___lib_libMagick___la_LDFLAGS = \
+- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
++ -release $(LIBRARY_CURRENT).$(LIBRARY_REVISION).$(LIBRARY_AGE)
-version-info 0:0:0
+ Magick___lib_libMagick___la_LIBADD = $(LIBMAGICK) $(LIBWAND)
+
+ MAGICKPP_CHECK_PGRMS = \
+--- ImageMagick-6.2.7/wand/Makefile.am.libname 2006-04-16 20:28:01.000000000
+0200
++++ ImageMagick-6.2.7/wand/Makefile.am 2006-04-18 10:14:21.000000000 +0200
+@@ -107,7 +107,7 @@
+
+ wand_libWand_la_SOURCES = $(WAND_SOURCES)
+ wand_libWand_la_LDFLAGS = -no-undefined \
+- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
++ -release $(LIBRARY_CURRENT).$(LIBRARY_REVISION).$(LIBRARY_AGE)
-version-info 0:0:0
+ wand_libWand_la_LIBADD = $(LIBMAGICK) $(X11_LIBS) $(MATH_LIBS)
+
+ WAND_EXTRA_DIST = \
+--- ImageMagick-6.2.7/scripts/Makefile.am.libname 2005-04-11
02:00:05.000000000 +0200
++++ ImageMagick-6.2.7/scripts/Makefile.am 2006-04-18 10:13:07.000000000
+0200
+@@ -136,7 +136,7 @@
+ Magick++/lib/Magick++/TypeMetric.h
+
+ Magick___lib_libMagick___la_LDFLAGS = \
+- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
++ -release $(LIBRARY_CURRENT).$(LIBRARY_REVISION).$(LIBRARY_AGE)
-version-info 0:0:0
+ Magick___lib_libMagick___la_LIBADD = $(LIBMAGICK) $(LIBWAND)
+
+ MAGICKPP_CHECK_PGRMS = \
+--- ImageMagick-6.2.7/magick/Makefile.am.libname 2006-03-30
23:13:46.000000000 +0200
++++ ImageMagick-6.2.7/magick/Makefile.am 2006-04-18 10:13:07.000000000
+0200
+@@ -40,7 +40,7 @@
+ endif # WITH_MODULES
+ magick_libMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl
$(LIBRARY_EXTRA_CPPFLAGS)
+ magick_libMagick_la_LDFLAGS = -no-undefined \
+- -version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
++ -release $(LIBRARY_CURRENT).$(LIBRARY_REVISION).$(LIBRARY_AGE)
-version-info 0:0:0
+
+ if CONVENIENCE_LTDL
+ magick_libMagick_la_DEPENDENCIES = $(LIBLTDL)
Added: packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-5.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-fpx.patch
==============================================================================
--- (empty file)
+++ packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-fpx.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,11 @@
+--- ImageMagick-6.3.2/configure.ac.fpx 2007-02-16 13:56:45.000000000 +0100
++++ ImageMagick-6.3.2/configure.ac 2007-02-16 13:57:51.000000000 +0100
+@@ -1388,7 +1388,7 @@
+ AC_MSG_RESULT(no -- some components failed test)
+ have_fpx='no (failed tests)'
+ else
+- FPX_LIBS='-lfpx'
++ FPX_LIBS='-lfpx -lstdc++'
+ # LIBS="$FPX_LIBS $LIBS"
+ AC_DEFINE(HasFPX,1,Define if you have FlashPIX library)
+ AC_MSG_RESULT(yes)
Added: packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-urw.patch
==============================================================================
--- (empty file)
+++ packages/cooker/ImageMagick/current/SOURCES/ImageMagick-6.3.2-urw.patch
Fri Feb 16 14:43:11 2007
@@ -0,0 +1,416 @@
+--- ImageMagick-6.3.2/config/type-ghostscript.xml.in.urw 2006-07-09
17:56:13.000000000 +0200
++++ ImageMagick-6.3.2/config/type-ghostscript.xml.in 2007-02-16
14:20:11.000000000 +0100
+@@ -427,4 +427,413 @@
+ version="0.1"
+ encoding="AdobeCustom"
+ />
++ <type
++ name="URWGothic-Book"
++ fullname="URW Gothic Book"
++ family="URW Gothic"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWGothic-BookOblique"
++ fullname="URW Gothic Book Oblique"
++ family="URW Gothic"
++ foundry="URW"
++ weight="400"
++ style="oblique"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWGothic-Demi"
++ fullname="URW Gothic DemiBold"
++ family="URW Gothic"
++ foundry="URW"
++ weight="600"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWGothic-DemiOblique"
++ fullname="URW Gothic DemiOblique"
++ family="URW Gothic"
++ foundry="URW"
++ weight="600"
++ style="oblique"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWBookman-Demi"
++ fullname="URW Bookman DemiBold"
++ family="URW Bookman"
++ foundry="URW"
++ weight="600"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWBookman-DemiItalic"
++ fullname="URW Bookman DemiBold Italic"
++ family="URW Bookman"
++ foundry="URW"
++ weight="600"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWBookman-Light"
++ fullname="URW Bookman Light"
++ family="URW Bookman"
++ foundry="URW"
++ weight="300"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWBookman-LightItalic"
++ fullname="URW Bookman Light Italic"
++ family="URW Bookman"
++ foundry="URW"
++ weight="300"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusMono"
++ fullname="Nimbus Mono Regular"
++ family="Nimbus Mono"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusMono-Bold"
++ fullname="Nimbus Mono Bold"
++ family="Nimbus Mono"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusMono-Oblique"
++ fullname="Nimbus Mono Regular Oblique"
++ family="Nimbus Mono"
++ foundry="URW"
++ weight="400"
++ style="oblique"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusMono-BoldOblique"
++ fullname="Nimbus Mono Bold Oblique"
++ family="Nimbus Mono"
++ foundry="URW"
++ weight="700"
++ style="oblique"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans"
++ fullname="Nimbus Sans Regular"
++ family="Nimbus Sans"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSansL"
++ fullname="Nimbus Sans L Regular"
++ family="Nimbus Sans L"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Bold"
++ fullname="Nimbus Sans Bold"
++ family="Nimbus Sans"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Oblique"
++ fullname="Nimbus Sans Regular Italic"
++ family="Nimbus Sans"
++ foundry="URW"
++ weight="400"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-BoldOblique"
++ fullname="Nimbus Sans Bold Italic"
++ family="Nimbus Sans"
++ foundry="URW"
++ weight="700"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Narrow"
++ fullname="Nimbus Sans Narrow"
++ family="Nimbus Sans Narrow"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="condensed"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Narrow-Oblique"
++ fullname="Nimbus Sans Narrow Oblique"
++ family="Nimbus Sans Narrow"
++ foundry="URW"
++ weight="400"
++ style="oblique"
++ stretch="condensed"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Narrow-Bold"
++ fullname="Nimbus Sans Narrow Bold"
++ family="Nimbus Sans Narrow"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="condensed"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusSans-Narrow-BoldOblique"
++ fullname="Nimbus Sans Narrow Bold Oblique"
++ family="Nimbus Sans Narrow"
++ foundry="URW"
++ weight="700"
++ style="oblique"
++ stretch="condensed"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="CenturySchoolbook-Roman"
++ fullname="Century Schoolbook"
++ family="Century Schoolbook"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="CenturySchoolbook-Italic"
++ fullname="Century Schoolbook Italic"
++ family="Century Schoolbook"
++ foundry="URW"
++ weight="400"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="CenturySchoolbook-Bold"
++ fullname="Century Schoolbook Bold"
++ family="Century Schoolbook"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="CenturySchoolbook-BoldItalic"
++ fullname="Century Schoolbook Bold Italic"
++ family="Century Schoolbook"
++ foundry="URW"
++ weight="700"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWPalladio-Roman"
++ fullname="URW Palladio Regular"
++ family="URW Palladio"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWPalladio-Italic"
++ fullname="URW Palladio Italic"
++ family="URW Palladio"
++ foundry="URW"
++ weight="400"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWPalladio-Bold"
++ fullname="URW Palladio Bold"
++ family="URW Palladio"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="URWPalladio-BoldItalic"
++ fullname="URW Palladio Bold Italic"
++ family="URW Palladio"
++ foundry="URW"
++ weight="700"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusRoman-Roman"
++ fullname="Nimbus Roman Regular"
++ family="Nimbus Roman"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusRoman-Bold"
++ fullname="Nimbus Roman Medium"
++ family="Nimbus Roman"
++ foundry="URW"
++ weight="700"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusRoman-Italic"
++ fullname="Nimbus Roman Regular Italic"
++ family="Nimbus Roman"
++ foundry="URW"
++ weight="400"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="NimbusRoman-BoldItalic"
++ fullname="Nimbus Roman Medium Italic"
++ family="Nimbus Roman"
++ foundry="URW"
++ weight="700"
++ style="italic"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ />
++ <type
++ name="StandardSymL"
++ fullname="Standard Symbols L"
++ family="Standard Symbols L"
++ foundry="URW"
++ weight="400"
++ style="normal"
++ stretch="normal"
++ format="type1"
++ metrics="@[EMAIL PROTECTED]"
++ glyphs="@[EMAIL PROTECTED]"
++ encoding="AdobeCustom"
++ />
+ </typemap>
Modified: packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec
==============================================================================
--- packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec (original)
+++ packages/cooker/ImageMagick/current/SPECS/ImageMagick.spec Fri Feb 16
14:43:11 2007
@@ -10,10 +10,10 @@
%define enable_graphwiz 0
%{?_with_graphwiz: %global enable_graphwiz 1}
-%define major 10.4.0
+%define major 10.7.0
%define libname %mklibname Magick %{major}
-%define fversion 6.2.9
-%define rev 8
+%define fversion 6.3.2
+%define rev 5
%define rel 1
%define qlev Q16
@@ -48,17 +48,14 @@
URL: http://www.imagemagick.org/
Source0:
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-%{dversion}.tar.bz2
Source1: ImageMagick.pdf.bz2
-Patch0: ImageMagick-6.2.7-docdir.patch.bz2
-Patch1: ImageMagick-5.2.1-tv.patch.bz2
-Patch4: ImageMagick-6.0.1-includedir.patch.bz2
-Patch7: ImageMagick-6.1.7-type-urw.patch.bz2
-Patch8: ImageMagick-6.2.7-libname.patch.bz2
-Patch17: ImageMagick-6.2.7-fpxdeps.patch.bz2
-Patch18: ImageMagick-6.1.7-windows-fontdir.patch.bz2
+Patch0: ImageMagick-6.2.7-docdir.patch
+Patch4: ImageMagick-6.0.1-includedir.patch
+Patch7: ImageMagick-6.3.2-urw.patch
+Patch8: ImageMagick-6.2.7-libname.patch
+Patch17: ImageMagick-6.3.2-fpx.patch
+Patch18: ImageMagick-6.1.7-windows-fontdir.patch
Patch19: ImageMagick-6.2.9-8-libpath.patch
-Patch20: ImageMagick-6.2.5-fix-montageimages-test.patch.bz2
-Patch21: ImageMagick-6.2.9-CVE-2006-5456.patch
-
+Patch20: ImageMagick-6.2.5-fix-montageimages-test.patch
Requires: %{libname} = %{version}
Requires: ghostscript
BuildRequires: ghostscript
@@ -180,7 +177,6 @@
%setup -q -n %{name}-%{fversion}
%patch0 -p1 -b .docdir
-%patch1 -p1 -b .tv_ln
%patch4 -p1 -b .include
%patch7 -p1 -b .urw
%patch8 -p1 -b .libname
@@ -188,10 +184,9 @@
%patch18 -p1 -b .windows
%patch19 -p1 -b .libpath
%patch20 -p1 -b .ppc
-%patch21 -p1 -b .cve-2006-5456
%__libtoolize --copy --force
-aclocal-1.8
+aclocal-1.8 -I m4
WANT_AUTOCONF_2_5=1 autoconf
automake-1.8
