- up to 6.8.7.3

diff --git a/ImageMagick-ldflags.patch b/ImageMagick-ldflags.patch
index 1a1b3af90322e40d320951b09f310bb84ade287a..0ba91b826852a7a3a30aa63fa224a4fa86962b72 100644 (file)
--- a/ImageMagick-ldflags.patch
+++ b/ImageMagick-ldflags.patch
@@ -16,6 +16,6 @@
 +      ;;
 +  esac
 +done
- MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS"
+ MAGICK_LIBS="$MAGICK_DEP_LIBS"
  
  AC_SUBST(MAGICK_CFLAGS)

diff --git a/ImageMagick-lt.patch b/ImageMagick-lt.patch
index 110190922d63cb1593927892afcca3367cef9091..36956c452fdce180c26569c7de1047c845cef837 100644 (file)
--- a/ImageMagick-lt.patch
+++ b/ImageMagick-lt.patch
@@ -1,9 +1,9 @@
 --- ImageMagick-6.6.6-7/configure.ac~  2010-12-27 13:27:17.432375100 +0100
 +++ ImageMagick-6.6.6-7/configure.ac   2010-12-27 13:30:28.809041767 +0100
-@@ -381,10 +381,6 @@
-         DEF_THREAD="$PTHREAD_CFLAGS"
+@@ -513,10 +513,6 @@
          CFLAGS="$CFLAGS $DEF_THREAD"
          CXXFLAGS="$CXXFLAGS $DEF_THREAD"
+       THREAD_LIBS="$PTHREAD_LIBS"
 -        if test "$CC" != "$PTHREAD_CC"; then
 -            AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
 -            CC="$PTHREAD_CC"
@@ -11,3 +11,4 @@
          AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
      fi
  fi
+

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 8f163786cc00edc49d807a7ee9ac1c499702ff6b..82cb9b64db1ee5578c00c788d6148d36ddd4eaba 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -18,8 +18,8 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %include       /usr/lib/rpm/macros.perl
-%define                ver     6.8.4
-%define                pver    8
+%define                ver     6.8.7
+%define                pver    3
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
 Summary(es.UTF-8):     Exhibidor, convertidor y manipulador de imágenes bajo X
@@ -31,12 +31,12 @@ Summary(tr.UTF-8):  X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       3
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 880879dbf6e3c6e8fe610e98a229b9c4
+# Source0-md5: b4653beb2f2b3cc33ea26490af567700
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
@@ -873,6 +873,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/raw.la
 %attr(755,root,root) %{modulesdir}/coders/rgb.so
 %{modulesdir}/coders/rgb.la
+%attr(755,root,root) %{modulesdir}/coders/rgf.so
+%{modulesdir}/coders/rgf.la
 %attr(755,root,root) %{modulesdir}/coders/rla.so
 %{modulesdir}/coders/rla.la
 %attr(755,root,root) %{modulesdir}/coders/rle.so
@@ -937,9 +939,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/filters/analyze.so
 %{modulesdir}/filters/analyze.la
 
-%dir %{_libdir}/ImageMagick-%{ver}/bin-%{abisuf}
-%attr(755,root,root) %{_libdir}/ImageMagick-%{ver}/bin-%{abisuf}/*
-
 %attr(755,root,root) %{_bindir}/animate
 %attr(755,root,root) %{_bindir}/compare
 %attr(755,root,root) %{_bindir}/composite
@@ -1158,7 +1157,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.3
 
 %files c++-devel
 %defattr(644,root,root,755)