Browse Source

upgrading package: imagemagick 6.3.7.5 -> 6.3.7.6

Christoph Schug 18 years ago
parent
commit
1f81e0e19e
2 changed files with 5 additions and 14 deletions
  1. 0 12
      imagemagick/imagemagick.patch
  2. 5 2
      imagemagick/imagemagick.spec

+ 0 - 12
imagemagick/imagemagick.patch

@@ -1,15 +1,3 @@
-Index: PerlMagick/Makefile.PL
---- PerlMagick/Makefile.PL.orig	2007-12-13 01:43:53 +0100
-+++ PerlMagick/Makefile.PL	2007-12-13 09:33:24 +0100
-@@ -27,7 +27,7 @@
- # Compute test specification
- my $delegate_tests='t/*.t';
- my $delegate;
--foreach $delegate (qw/bzlib fontconfig freetype gs gvc jpeg jp2 lcms openexr png tiff x11 xml zlib/) {
-+foreach $delegate (qw/bzlib fontconfig freetype gs gvc jpeg     lcms openexr png tiff x11 xml zlib/) {
-   if ( -d "t/$delegate" ) {
-     if ($delegate =~ /x11/) {
-       if ( defined $ENV{'DISPLAY'} ) {
 Index: configure
 --- configure.orig	2007-12-13 09:34:07 +0100
 +++ configure	2007-12-13 10:17:10 +0100

+ 5 - 2
imagemagick/imagemagick.spec

@@ -24,7 +24,7 @@
 
 #   package version
 %define       V_major 6.3.7
-%define       V_minor 5
+%define       V_minor 6
 %define       V_dist  %{V_major}-%{V_minor}
 %define       V_opkg  %{V_major}.%{V_minor}
 
@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Graphics
 License:      GPL
 Version:      %{V_opkg}
-Release:      20071216
+Release:      20071219
 
 #   package options
 %option       with_perl   no
@@ -92,6 +92,9 @@ AutoReqProv:  no
         -e 's/^\(MagickLibSubdir="\)[^"]*\("\)/\1imagemagick\2/' \
         -e 's/\(-lxml2\)/\1 -liconv/' \
         configure
+    %{l_shtool} subst \
+        -e 's;^\(foreach $delegate (.* \)jp2 \(.*\)$;\1\2;' \
+        PerlMagick/Makefile.PL
     %{l_shtool} subst \
         -e 's;\(-L@MAGICKLIBDIR@\);-L../magick/.libs \1;g' \
         PerlMagick/Makefile.PL.in