- removed obsolete old_am patch and some hacks from spec

- added new conjure utility
- release 2

Changed files:
    ImageMagick-old_am.patch -> 1.2
    ImageMagick.spec -> 1.122

diff --git a/ImageMagick-old_am.patch b/ImageMagick-old_am.patch
deleted file mode 100644 (file)
index 8eb176d..0000000
--- a/ImageMagick-old_am.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ImageMagick-5.4.7/Makefile.am~     Wed Jul  3 21:14:23 2002
-+++ ImageMagick-5.4.7/Makefile.am      Wed Jul  3 21:14:23 2002
-@@ -28,7 +28,7 @@
- # ImageMagick Studio.
- 
- # Don't require all the GNU mandated files
--AUTOMAKE_OPTIONS = 1.6.2 dist-zip dist-bzip2 foreign
-+AUTOMAKE_OPTIONS = dist-zip dist-bzip2 foreign
- 
- # Subdirectories to build
- if WITH_MAGICK_PLUS_PLUS
---- ImageMagick-5.4.7/ltdl/Makefile.am~        Wed Jul  3 21:14:23 2002
-+++ ImageMagick-5.4.7/ltdl/Makefile.am Wed Jul  3 21:14:23 2002
-@@ -27,7 +27,7 @@
- # ImageMagick Studio.
- #
- 
--AUTOMAKE_OPTIONS = 1.6.2 foreign
-+AUTOMAKE_OPTIONS = foreign
- 
- if WITH_MODULES
- 

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 191d20697fae4e470d9a33d1f9079c153e0a5f55..90525b853355298a807afa8f44d18d8dda6e64c7 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -17,7 +17,7 @@ Summary(tr):  X alt
 Summary(uk):   ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä X Windows
 Name:          ImageMagick
 Version:       5.4.9
-Release:       1
+Release:       2
 Epoch:         1
 License:       Freeware
 Group:         X11/Applications/Graphics
@@ -25,7 +25,6 @@ Source0:      http://imagemagick.sourceforge.net/http/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-perlpaths.patch
 Patch2:                %{name}-ac.patch
-Patch3:                %{name}-old_am.patch
 URL:           http://www.imagemagick.org/
 BuildRequires: XFree86-DPS-devel
 BuildRequires: XFree86-devel
@@ -388,11 +387,6 @@ Bibliotecas est
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
-
-# fix lcms.h include path
-perl -pi -e 's@lcms/lcms\.h@lcms.h@' magick/transform.c
-perl -pi -e 's@lcms/lcms\.h@lcms.h@' configure.ac
 
 %build
 rm -f missing
@@ -400,12 +394,8 @@ rm -f missing
 aclocal
 %{__autoconf}
 %{__automake}
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
-       CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
-CPPFLAGS="$CPPFLAGS -I/usr/include/g++"
+#CPPFLAGS="$CPPFLAGS -I/usr/include/g++"
 %configure \
-       CPPFLAGS="$CPPFLAGS" \
        --enable-16bit-pixel \
        --enable-lzw \
        --enable-shared \
@@ -453,6 +443,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/animate
 #%attr(755,root,root) %{_bindir}/cgimagick
 %attr(755,root,root) %{_bindir}/composite
+%attr(755,root,root) %{_bindir}/conjure
 %attr(755,root,root) %{_bindir}/convert
 %attr(755,root,root) %{_bindir}/display
 %attr(755,root,root) %{_bindir}/identify