/[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

cauldron/imagemagick/current/SPECS/imagemagick.spec revision 253233 by fwang, Sat Jun 2 03:19:50 2012 UTC updates/3/imagemagick/current/SPECS/imagemagick.spec revision 796911 by luigiwalser, Fri Nov 14 00:17:18 2014 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.1
13    
14  # their "minor" version  # their "minor" version
15  %define minor_rev 5  %define minor_rev 1
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 25  Line 25 
25  # the full file version  # the full file version
26  %define dversion %{rversion}-%{minor_rev}  %define dversion %{rversion}-%{minor_rev}
27    
28  %define major 5  %define major 7
29    
30  %define libname %mklibname magick %{major}  %define libname %mklibname magick %{major}
31  %define develname %mklibname magick -d  %define develname %mklibname magick -d
# 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 1  %define subrel  2
37    Release:        %mkrel 2
38  License:        BSD-like  License:        BSD-like
39  Group:          Graphics  Group:          Graphics/Editors and Converters
40  URL:            http://www.imagemagick.org/  URL:            http://www.imagemagick.org/
41  Source0:        ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{dversion}.tar.xz  Source0:        http://www.imagemagick.org/download/ImageMagick-%{dversion}.tar.xz
42  Source1:        ImageMagick.pdf.bz2  Source1:        ImageMagick.pdf.bz2
43  # re-scaled from ftp://ftp.imagemagick.org/pub/ImageMagick/images/magick-icon.png  # re-scaled from ftp://ftp.imagemagick.org/pub/ImageMagick/images/magick-icon.png
44  Source10:       magick-icon_16x16.png  Source10:       magick-icon_16x16.png
# Line 51  Patch2:                ImageMagick-6.7.4-force-so.patc Line 52  Patch2:                ImageMagick-6.7.4-force-so.patc
52  Patch7:         imagemagick-urw.diff  Patch7:         imagemagick-urw.diff
53  Patch17:        imagemagick-fpx.diff  Patch17:        imagemagick-fpx.diff
54  Patch19:        ImageMagick-libpath.diff  Patch19:        ImageMagick-libpath.diff
55  Patch20:        ImageMagick-6.4.8-9-fix-montageimages-test.patch  Patch20:        ImageMagick-6.7.7-9-fix-montageimages-test.patch
56    Patch21:        imagemagick-CVE-2014-2030.patch
57    Patch22:        imagemagick-CVE-2014-1958.patch
58    Patch23:        imagemagick-CVE-2014-8354.patch
59    Patch24:        imagemagick-CVE-2014-8355.patch
60    Patch25:        imagemagick-CVE-2014-8562.patch
61    Patch26:        imagemagick-CVE-2014-8716.patch
62    
63  Requires:       %{libname} = %{version}  Requires:       %{libname} = %{version}
64  Obsoletes:      ImageMagick < 6.3.2.9-6  Obsoletes:      ImageMagick < 6.3.2.9-6
# Line 71  BuildRequires:  libjpeg-devel Line 78  BuildRequires:  libjpeg-devel
78  BuildRequires:  libpng-devel  BuildRequires:  libpng-devel
79  BuildRequires:  zlib-devel  BuildRequires:  zlib-devel
80  BuildRequires:  lcms-devel  BuildRequires:  lcms-devel
81    BuildRequires:  lcms2-devel
82    BuildRequires:  fftw-devel
83  BuildRequires:  lqr-devel  BuildRequires:  lqr-devel
84  BuildRequires:  libltdl-devel  BuildRequires:  libltdl-devel
85  BuildRequires:  perl-devel  BuildRequires:  perl-devel
# Line 79  BuildRequires:  tiff-devel Line 88  BuildRequires:  tiff-devel
88  BuildRequires:  libwmf-devel  BuildRequires:  libwmf-devel
89  BuildRequires:  libxml2-devel  BuildRequires:  libxml2-devel
90  BuildRequires:  lzma-devel  BuildRequires:  lzma-devel
91    BuildRequires:  pkgconfig(libwebp)
92  %if !%bootstrap  %if !%bootstrap
93  BuildRequires:  djvulibre-devel  BuildRequires:  djvulibre-devel
94  %endif  %endif
# Line 98  transfig ufraw xdg-utils zip autotrace p Line 108  transfig ufraw xdg-utils zip autotrace p
108    
109  %package        desktop  %package        desktop
110  Summary:        ImageMagick menus  Summary:        ImageMagick menus
111  Group:          Graphics  Group:          Graphics/Editors and Converters
112  Requires:       xterm  Requires:       xterm
113  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6
114    
# Line 109  command from the menu. Line 119  command from the menu.
119  %package -n     %{libname}  %package -n     %{libname}
120  Summary:        ImageMagick libraries  Summary:        ImageMagick libraries
121  Group:          System/Libraries  Group:          System/Libraries
122    Provides:       %{_lib}magick = %{version}
123  # (Anssi 02/2008): Wrongly named at first, can be removed when major changes again:  # (Anssi 02/2008): Wrongly named at first, can be removed when major changes again:
124  Obsoletes:      %{_lib}magick%{major}.0.0 < %{version}-%{release}  Obsoletes:      %{_lib}magick%{major}.0.0 < %{version}-%{release}
125    
# Line 158  support files for access to ImageMagick Line 169  support files for access to ImageMagick
169    
170  %package        doc  %package        doc
171  Summary:        %{name} Documentation  Summary:        %{name} Documentation
172  Group:          Books/Other  Group:          Documentation
173  Obsoletes:      ImageMagick-doc < 6.3.2.9-6  Obsoletes:      ImageMagick-doc < 6.3.2.9-6
174  BuildArch:      noarch  BuildArch:      noarch
175    
# Line 175  This package contains HTML/PDF documenta Line 186  This package contains HTML/PDF documenta
186  %patch17 -p0 -b .fpx  %patch17 -p0 -b .fpx
187  %patch19 -p1 -b .libpath  %patch19 -p1 -b .libpath
188  %patch20 -p1 -b .ppc  %patch20 -p1 -b .ppc
189    %patch21 -p4 -b .CVE-2014-2030
190    %patch22 -p4 -b .CVE-2014-1958
191    %patch23 -p1 -b .CVE-2014-8354
192    %patch24 -p1 -b .CVE-2014-8355
193    %patch25 -p1 -b .CVE-2014-8562
194    %patch26 -p1 -b .CVE-2014-8716
195    
196  bzcat %{SOURCE1} > ImageMagick.pdf  bzcat %{SOURCE1} > ImageMagick.pdf
197  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
# Line 194  export PATH=/bin:/usr/bin Line 211  export PATH=/bin:/usr/bin
211      --with-pic \      --with-pic \
212      --enable-shared --disable-static \      --enable-shared --disable-static \
213      --enable-fast-install \      --enable-fast-install \
     --disable-ltdl-install \  
214      --with-threads \      --with-threads \
215      --with-magick_plus_plus \      --with-magick_plus_plus \
216      --with-gslib \      --with-gslib \
# Line 206  export PATH=/bin:/usr/bin Line 222  export PATH=/bin:/usr/bin
222      --without-windows-font-dir \      --without-windows-font-dir \
223      --with-modules \      --with-modules \
224      --with-perl \      --with-perl \
     --without-included-ltdl --with-ltdl-include=%{_includedir} \  
     --with-ltdl-lib=%{_libdir} \  
225      --with-perl-options="INSTALLDIRS=vendor CC='%{__cc} -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \      --with-perl-options="INSTALLDIRS=vendor CC='%{__cc} -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
226      --with-jp2 \      --with-jp2 \
227      --with-gvc \      --with-gvc \
228      --with-lqr      --with-lqr
229    
 # without the following, it doesn't build correctly with "make -j 4"  
 perl -lpi -e '$_ .= " magick/libMagickCore.la" if index($_, q($(PERLMAKEFILE))) == 0' Makefile  
   
230  # Disable rpath  # Disable rpath
231  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
232  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# Line 246  rm -rf installed_docs; mv %{buildroot}/i Line 257  rm -rf installed_docs; mv %{buildroot}/i
257  # Remove unpackaged files  # Remove unpackaged files
258  find %{buildroot} -name '*.la' -delete  find %{buildroot} -name '*.la' -delete
259    
260    # create compatible symlinks
261    ln -s libMagick++-%{qlev}.so %{buildroot}%{_libdir}/libMagick++.so
262    ln -s libMagickCore-%{qlev}.so %{buildroot}%{_libdir}/libMagickCore.so
263    ln -s libMagickWand-%{qlev}.so %{buildroot}%{_libdir}/libMagickWand.so
264    
265  %multiarch_binaries %{buildroot}%{_bindir}/Magick-config  %multiarch_binaries %{buildroot}%{_bindir}/Magick-config
266  %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config  %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config
267  %multiarch_binaries %{buildroot}%{_bindir}/MagickCore-config  %multiarch_binaries %{buildroot}%{_bindir}/MagickCore-config
# Line 306  EOF Line 322  EOF
322  %{_iconsdir}/hicolor/64x64/apps/%{name}.png  %{_iconsdir}/hicolor/64x64/apps/%{name}.png
323    
324  %files -n %{libname}  %files -n %{libname}
325  %{_libdir}/libMagick++.so.%{major}*  %{_libdir}/libMagick++-%{qlev}.so.%{major}*
326  %{_libdir}/libMagickCore.so.%{major}*  %{_libdir}/libMagickCore-%{qlev}.so.%{major}*
327  %{_libdir}/libMagickWand.so.%{major}*  %{_libdir}/libMagickWand-%{qlev}.so.%{major}*
328    
329  %files -n %{develname}  %files -n %{develname}
330  %{_includedir}/ImageMagick  %{_includedir}/ImageMagick

Legend:
Removed from v.253233  
changed lines
  Added in v.796911

  ViewVC Help
Powered by ViewVC 1.1.26