/[packages]/updates/3/imagemagick/current/SPECS/imagemagick.spec
ViewVC logotype

Diff of /updates/3/imagemagick/current/SPECS/imagemagick.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 247624 by fwang, Sun May 27 21:50:17 2012 UTC revision 263796 by fwang, Tue Jun 26 03:14:45 2012 UTC
# Line 12  Line 12 
12  %define rversion 6.7.7  %define rversion 6.7.7
13    
14  # their "minor" version  # their "minor" version
15  %define minor_rev 2  %define minor_rev 9
16    
17  # some other funny version  # some other funny version
18  # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel  # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel
# Line 33  Line 33 
33  Summary:        An X application for displaying and manipulating images  Summary:        An X application for displaying and manipulating images
34  Name:           imagemagick  Name:           imagemagick
35  Version:        %{rversion}.%{minor_rev}  Version:        %{rversion}.%{minor_rev}
36  Release:        %mkrel 2  Release:        %mkrel 1
37  License:        BSD-like  License:        BSD-like
38  Group:          Graphics  Group:          Graphics
39  URL:            http://www.imagemagick.org/  URL:            http://www.imagemagick.org/
# Line 51  Patch2:                ImageMagick-6.7.4-force-so.patc Line 51  Patch2:                ImageMagick-6.7.4-force-so.patc
51  Patch7:         imagemagick-urw.diff  Patch7:         imagemagick-urw.diff
52  Patch17:        imagemagick-fpx.diff  Patch17:        imagemagick-fpx.diff
53  Patch19:        ImageMagick-libpath.diff  Patch19:        ImageMagick-libpath.diff
54  Patch20:        ImageMagick-6.4.8-9-fix-montageimages-test.patch  Patch20:        ImageMagick-6.7.7-9-fix-montageimages-test.patch
 Patch21:        ImageMagick-6.7.5-10-CVE-2012-0259-CVE-2012-0260-CVE-2012-1798.patch  
 Patch22:        ImageMagick-6.7.5-10-CVE-2012-1610.patch  
55    
56  Requires:       %{libname} = %{version}  Requires:       %{libname} = %{version}
57  Obsoletes:      ImageMagick < 6.3.2.9-6  Obsoletes:      ImageMagick < 6.3.2.9-6
# Line 85  BuildRequires:  lzma-devel Line 83  BuildRequires:  lzma-devel
83  BuildRequires:  djvulibre-devel  BuildRequires:  djvulibre-devel
84  %endif  %endif
85  BuildRequires:  ghostscript  BuildRequires:  ghostscript
86    BuildRequires:  subversion
87  BuildConflicts: %{develname}  BuildConflicts: %{develname}
88    
89  %description  %description
# Line 171  This package contains HTML/PDF documenta Line 170  This package contains HTML/PDF documenta
170  %setup -q -n ImageMagick-%{rversion}-%minor_rev  %setup -q -n ImageMagick-%{rversion}-%minor_rev
171    
172  %patch0 -p1 -b .docdir  %patch0 -p1 -b .docdir
 #patch1 -p1  
173  %patch2 -p0 -b .so  %patch2 -p0 -b .so
174  %patch7 -p0 -b .urw  %patch7 -p0 -b .urw
175  %patch17 -p0 -b .fpx  %patch17 -p0 -b .fpx
176  %patch19 -p1 -b .libpath  %patch19 -p1 -b .libpath
177  %patch20 -p1 -b .ppc  %patch20 -p1 -b .ppc
 %patch21 -p1 -b .exif-tag-crash  
 %patch22 -p1 -b .exif-tag-crash-fix  
178    
179  bzcat %{SOURCE1} > ImageMagick.pdf  bzcat %{SOURCE1} > ImageMagick.pdf
180  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
181  libtoolize --copy --force; aclocal -I m4; autoconf; automake  autoreconf -fi
182    
183  %build  %build
184  #gw the format-string patch is incomplete:  #gw the format-string patch is incomplete:

Legend:
Removed from v.247624  
changed lines
  Added in v.263796

  ViewVC Help
Powered by ViewVC 1.1.30