/[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 305056 by fwang, Fri Oct 12 19:36:20 2012 UTC
# Line 9  Line 9 
9  # V E R S I O N   P A R T S  # V E R S I O N   P A R T S
10    
11  # their "official" version  # their "official" version
12  %define rversion 6.7.7  %define rversion 6.8.0
13    
14  # their "minor" version  # their "minor" version
15  %define minor_rev 2  %define minor_rev 0
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/Editors
39  URL:            http://www.imagemagick.org/  URL:            http://www.imagemagick.org/
40  Source0:        ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{dversion}.tar.xz  Source0:        ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{dversion}.tar.xz
41  Source1:        ImageMagick.pdf.bz2  Source1:        ImageMagick.pdf.bz2
# 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 73  BuildRequires:  libjpeg-devel Line 71  BuildRequires:  libjpeg-devel
71  BuildRequires:  libpng-devel  BuildRequires:  libpng-devel
72  BuildRequires:  zlib-devel  BuildRequires:  zlib-devel
73  BuildRequires:  lcms-devel  BuildRequires:  lcms-devel
74    BuildRequires:  lcms2-devel
75    BuildRequires:  fftw-devel
76  BuildRequires:  lqr-devel  BuildRequires:  lqr-devel
77  BuildRequires:  libltdl-devel  BuildRequires:  libltdl-devel
78  BuildRequires:  perl-devel  BuildRequires:  perl-devel
# Line 85  BuildRequires:  lzma-devel Line 85  BuildRequires:  lzma-devel
85  BuildRequires:  djvulibre-devel  BuildRequires:  djvulibre-devel
86  %endif  %endif
87  BuildRequires:  ghostscript  BuildRequires:  ghostscript
88    BuildRequires:  subversion
89  BuildConflicts: %{develname}  BuildConflicts: %{develname}
90    
91  %description  %description
# Line 99  transfig ufraw xdg-utils zip autotrace p Line 100  transfig ufraw xdg-utils zip autotrace p
100    
101  %package        desktop  %package        desktop
102  Summary:        ImageMagick menus  Summary:        ImageMagick menus
103  Group:          Graphics  Group:          Graphics/Editors
104  Requires:       xterm  Requires:       xterm
105  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6
106    
# Line 159  support files for access to ImageMagick Line 160  support files for access to ImageMagick
160    
161  %package        doc  %package        doc
162  Summary:        %{name} Documentation  Summary:        %{name} Documentation
163  Group:          Books/Other  Group:          Documentation
164  Obsoletes:      ImageMagick-doc < 6.3.2.9-6  Obsoletes:      ImageMagick-doc < 6.3.2.9-6
165  BuildArch:      noarch  BuildArch:      noarch
166    
# Line 171  This package contains HTML/PDF documenta Line 172  This package contains HTML/PDF documenta
172  %setup -q -n ImageMagick-%{rversion}-%minor_rev  %setup -q -n ImageMagick-%{rversion}-%minor_rev
173    
174  %patch0 -p1 -b .docdir  %patch0 -p1 -b .docdir
 #patch1 -p1  
175  %patch2 -p0 -b .so  %patch2 -p0 -b .so
176  %patch7 -p0 -b .urw  %patch7 -p0 -b .urw
177  %patch17 -p0 -b .fpx  %patch17 -p0 -b .fpx
178  %patch19 -p1 -b .libpath  %patch19 -p1 -b .libpath
179  %patch20 -p1 -b .ppc  %patch20 -p1 -b .ppc
 %patch21 -p1 -b .exif-tag-crash  
 %patch22 -p1 -b .exif-tag-crash-fix  
180    
181  bzcat %{SOURCE1} > ImageMagick.pdf  bzcat %{SOURCE1} > ImageMagick.pdf
182  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
183  libtoolize --copy --force; aclocal -I m4; autoconf; automake  autoreconf -fi
184    
185  %build  %build
186  #gw the format-string patch is incomplete:  #gw the format-string patch is incomplete:

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

  ViewVC Help
Powered by ViewVC 1.1.30