/[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 251908 by blino, Wed May 30 23:01:45 2012 UTC updates/3/imagemagick/current/SPECS/imagemagick.spec revision 595156 by luigiwalser, Thu Feb 20 17:16:21 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 2  %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    %define subrel  1
37  Release:        %mkrel 2  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    
59  Requires:       %{libname} = %{version}  Requires:       %{libname} = %{version}
60  Obsoletes:      ImageMagick < 6.3.2.9-6  Obsoletes:      ImageMagick < 6.3.2.9-6
# Line 71  BuildRequires:  libjpeg-devel Line 74  BuildRequires:  libjpeg-devel
74  BuildRequires:  libpng-devel  BuildRequires:  libpng-devel
75  BuildRequires:  zlib-devel  BuildRequires:  zlib-devel
76  BuildRequires:  lcms-devel  BuildRequires:  lcms-devel
77    BuildRequires:  lcms2-devel
78    BuildRequires:  fftw-devel
79  BuildRequires:  lqr-devel  BuildRequires:  lqr-devel
80  BuildRequires:  libltdl-devel  BuildRequires:  libltdl-devel
81  BuildRequires:  perl-devel  BuildRequires:  perl-devel
# Line 79  BuildRequires:  tiff-devel Line 84  BuildRequires:  tiff-devel
84  BuildRequires:  libwmf-devel  BuildRequires:  libwmf-devel
85  BuildRequires:  libxml2-devel  BuildRequires:  libxml2-devel
86  BuildRequires:  lzma-devel  BuildRequires:  lzma-devel
87    BuildRequires:  pkgconfig(libwebp)
88  %if !%bootstrap  %if !%bootstrap
89  BuildRequires:  djvulibre-devel  BuildRequires:  djvulibre-devel
90  %endif  %endif
# Line 98  transfig ufraw xdg-utils zip autotrace p Line 104  transfig ufraw xdg-utils zip autotrace p
104    
105  %package        desktop  %package        desktop
106  Summary:        ImageMagick menus  Summary:        ImageMagick menus
107  Group:          Graphics  Group:          Graphics/Editors and Converters
108  Requires:       xterm  Requires:       xterm
109  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6  Obsoletes:      ImageMagick-desktop < 6.3.2.9-6
110    
# Line 109  command from the menu. Line 115  command from the menu.
115  %package -n     %{libname}  %package -n     %{libname}
116  Summary:        ImageMagick libraries  Summary:        ImageMagick libraries
117  Group:          System/Libraries  Group:          System/Libraries
118    Provides:       %{_lib}magick = %{version}
119  # (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:
120  Obsoletes:      %{_lib}magick%{major}.0.0 < %{version}-%{release}  Obsoletes:      %{_lib}magick%{major}.0.0 < %{version}-%{release}
121    
# Line 158  support files for access to ImageMagick Line 165  support files for access to ImageMagick
165    
166  %package        doc  %package        doc
167  Summary:        %{name} Documentation  Summary:        %{name} Documentation
168  Group:          Books/Other  Group:          Documentation
169  Obsoletes:      ImageMagick-doc < 6.3.2.9-6  Obsoletes:      ImageMagick-doc < 6.3.2.9-6
170  BuildArch:      noarch  BuildArch:      noarch
171    
# Line 175  This package contains HTML/PDF documenta Line 182  This package contains HTML/PDF documenta
182  %patch17 -p0 -b .fpx  %patch17 -p0 -b .fpx
183  %patch19 -p1 -b .libpath  %patch19 -p1 -b .libpath
184  %patch20 -p1 -b .ppc  %patch20 -p1 -b .ppc
185    %patch21 -p4 -b .CVE-2014-2030
186    %patch22 -p4 -b .CVE-2014-1958
187    
188  bzcat %{SOURCE1} > ImageMagick.pdf  bzcat %{SOURCE1} > ImageMagick.pdf
189  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .  install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
190  libtoolize --copy --force; aclocal -I m4; autoconf; automake  autoreconf -fi
191    
192  %build  %build
193  #gw the format-string patch is incomplete:  #gw the format-string patch is incomplete:
# Line 194  export PATH=/bin:/usr/bin Line 203  export PATH=/bin:/usr/bin
203      --with-pic \      --with-pic \
204      --enable-shared --disable-static \      --enable-shared --disable-static \
205      --enable-fast-install \      --enable-fast-install \
     --disable-ltdl-install \  
206      --with-threads \      --with-threads \
207      --with-magick_plus_plus \      --with-magick_plus_plus \
208      --with-gslib \      --with-gslib \
# Line 206  export PATH=/bin:/usr/bin Line 214  export PATH=/bin:/usr/bin
214      --without-windows-font-dir \      --without-windows-font-dir \
215      --with-modules \      --with-modules \
216      --with-perl \      --with-perl \
     --without-included-ltdl --with-ltdl-include=%{_includedir} \  
     --with-ltdl-lib=%{_libdir} \  
217      --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'" \
218      --with-jp2 \      --with-jp2 \
219      --with-gvc \      --with-gvc \
220      --with-lqr      --with-lqr
221    
 # without the following, it doesn't build correctly with "make -j 4"  
 perl -lpi -e '$_ .= " magick/libMagickCore.la" if index($_, q($(PERLMAKEFILE))) == 0' Makefile  
   
222  # Disable rpath  # Disable rpath
223  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
224  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 249  rm -rf installed_docs; mv %{buildroot}/i
249  # Remove unpackaged files  # Remove unpackaged files
250  find %{buildroot} -name '*.la' -delete  find %{buildroot} -name '*.la' -delete
251    
252    # create compatible symlinks
253    ln -s libMagick++-%{qlev}.so %{buildroot}%{_libdir}/libMagick++.so
254    ln -s libMagickCore-%{qlev}.so %{buildroot}%{_libdir}/libMagickCore.so
255    ln -s libMagickWand-%{qlev}.so %{buildroot}%{_libdir}/libMagickWand.so
256    
257  %multiarch_binaries %{buildroot}%{_bindir}/Magick-config  %multiarch_binaries %{buildroot}%{_bindir}/Magick-config
258  %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config  %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config
259  %multiarch_binaries %{buildroot}%{_bindir}/MagickCore-config  %multiarch_binaries %{buildroot}%{_bindir}/MagickCore-config
# Line 306  EOF Line 314  EOF
314  %{_iconsdir}/hicolor/64x64/apps/%{name}.png  %{_iconsdir}/hicolor/64x64/apps/%{name}.png
315    
316  %files -n %{libname}  %files -n %{libname}
317  %{_libdir}/libMagick++.so.%{major}*  %{_libdir}/libMagick++-%{qlev}.so.%{major}*
318  %{_libdir}/libMagickCore.so.%{major}*  %{_libdir}/libMagickCore-%{qlev}.so.%{major}*
319  %{_libdir}/libMagickWand.so.%{major}*  %{_libdir}/libMagickWand-%{qlev}.so.%{major}*
320    
321  %files -n %{develname}  %files -n %{develname}
322  %{_includedir}/ImageMagick  %{_includedir}/ImageMagick

Legend:
Removed from v.251908  
changed lines
  Added in v.595156

  ViewVC Help
Powered by ViewVC 1.1.30