- Update to 6.8.5-10 upstream version (bz#720285).
- By Remi Collet request (bz#969760) enable those features in ImageMagick: --with-lcms2 (instead of --with-lcms): lcms2-devel --with-openexr: OpenEXR-devel --with-webp: libwebp-devel
This commit is contained in:
parent
3d43559028
commit
a619cc2b18
@ -1,191 +0,0 @@
|
||||
diff -up ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in
|
||||
--- ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in 2009-02-24 10:55:05.000000000 +0100
|
||||
@@ -7,8 +7,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@
|
||||
|
||||
usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
|
||||
|
||||
@@ -43,19 +41,19 @@ while test $# -gt 0; do
|
||||
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
|
||||
;;
|
||||
--cflags)
|
||||
- echo "-I${includedir} @MAGICK_PCFLAGS@"
|
||||
+ pkg-config --cflags Magick++
|
||||
;;
|
||||
--cxxflags)
|
||||
- echo '@MAGICK_CXXFLAGS@'
|
||||
+ pkg-config --cflags Magick++
|
||||
;;
|
||||
--cppflags)
|
||||
- echo '@MAGICK_CPPFLAGS@'
|
||||
+ pkg-config --cflags Magick++
|
||||
;;
|
||||
--ldflags)
|
||||
- echo '@MAGICK_LDFLAGS@'
|
||||
+ pkg-config --libs Magick++
|
||||
;;
|
||||
--libs)
|
||||
- echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@"
|
||||
+ pkg-config --libs Magick++
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
diff -up ImageMagick-6.4.9-6/magick/Magick-config.in.multilib ImageMagick-6.4.9-6/magick/Magick-config.in
|
||||
--- ImageMagick-6.4.9-6/magick/Magick-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/magick/Magick-config.in 2009-02-24 10:57:33.000000000 +0100
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@/ImageMagick
|
||||
|
||||
usage="\
|
||||
Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
||||
@@ -40,19 +38,19 @@ while test $# -gt 0; do
|
||||
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
|
||||
;;
|
||||
--cflags)
|
||||
- echo "-I${includedir} @MAGICK_PCFLAGS@"
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--cxxflags)
|
||||
- echo '@MAGICK_CXXFLAGS@'
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--cppflags)
|
||||
- echo '@MAGICK_CPPFLAGS@'
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--ldflags)
|
||||
- echo '@MAGICK_LDFLAGS@'
|
||||
+ pkg-config --libs MagickCore
|
||||
;;
|
||||
--libs)
|
||||
- echo "-L${libdir} @MAGICK_LIBS@"
|
||||
+ pkg-config --libs MagickCore
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
diff -up ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib ImageMagick-6.4.9-6/magick/MagickCore-config.in
|
||||
--- ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/magick/MagickCore-config.in 2009-02-24 11:02:23.000000000 +0100
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@/ImageMagick
|
||||
|
||||
usage="\
|
||||
Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
||||
@@ -40,25 +38,19 @@ while test $# -gt 0; do
|
||||
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
|
||||
;;
|
||||
--cflags)
|
||||
- echo "-I${includedir} @MAGICK_PCFLAGS@"
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--cxxflags)
|
||||
- echo '@MAGICK_CXXFLAGS@'
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--cppflags)
|
||||
- echo '@MAGICK_CPPFLAGS@'
|
||||
+ pkg-config --cflags MagickCore
|
||||
;;
|
||||
--ldflags)
|
||||
- echo '@MAGICK_LDFLAGS@'
|
||||
+ pkg-config --libs MagickCore
|
||||
;;
|
||||
--libs)
|
||||
- echo "-L${libdir} @MAGICK_LIBS@"
|
||||
- ;;
|
||||
- --coder-path)
|
||||
- echo "@CODER_PATH@"
|
||||
- ;;
|
||||
- --filter-path)
|
||||
- echo "@FILTER_PATH@"
|
||||
+ pkg-config --libs MagickCore
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
diff -up ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib ImageMagick-6.4.9-6/wand/MagickWand-config.in
|
||||
--- ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/wand/MagickWand-config.in 2009-02-24 11:01:09.000000000 +0100
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@/ImageMagick
|
||||
|
||||
usage="\
|
||||
Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
||||
@@ -40,19 +38,19 @@ while test $# -gt 0; do
|
||||
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
|
||||
;;
|
||||
--cflags)
|
||||
- echo "-I${includedir} @MAGICK_PCFLAGS@"
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--cxxflags)
|
||||
- echo '@MAGICK_CXXFLAGS@'
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--cppflags)
|
||||
- echo '@MAGICK_CPPFLAGS@'
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--ldflags)
|
||||
- echo '@MAGICK_LDFLAGS@'
|
||||
+ pkg-config --libs MagickWand
|
||||
;;
|
||||
--libs)
|
||||
- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
|
||||
+ pkg-config --libs MagickWand
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
diff -up ImageMagick-6.4.9-6/wand/Wand-config.in.multilib ImageMagick-6.4.9-6/wand/Wand-config.in
|
||||
--- ImageMagick-6.4.9-6/wand/Wand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/wand/Wand-config.in 2009-02-24 10:54:27.000000000 +0100
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
-libdir=@libdir@
|
||||
-includedir=@includedir@/ImageMagick
|
||||
|
||||
usage="\
|
||||
Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
|
||||
@@ -40,19 +38,19 @@ while test $# -gt 0; do
|
||||
echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
|
||||
;;
|
||||
--cflags)
|
||||
- echo "-I${includedir} @MAGICK_PCFLAGS@"
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--cxxflags)
|
||||
- echo '@MAGICK_CXXFLAGS@'
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--cppflags)
|
||||
- echo '@MAGICK_CPPFLAGS@'
|
||||
+ pkg-config --cflags MagickWand
|
||||
;;
|
||||
--ldflags)
|
||||
- echo '@MAGICK_LDFLAGS@'
|
||||
+ pkg-config --libs MagickWand
|
||||
;;
|
||||
--libs)
|
||||
- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
|
||||
+ pkg-config --libs MagickWand
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
@ -1,9 +1,9 @@
|
||||
%global VER 6.8.3
|
||||
%global Patchlevel 9
|
||||
%global VER 6.8.5
|
||||
%global Patchlevel 10
|
||||
|
||||
Name: ImageMagick
|
||||
Version: %{VER}.%{Patchlevel}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: An X application for displaying and manipulating images
|
||||
Group: Applications/Multimedia
|
||||
License: ImageMagick
|
||||
@ -18,8 +18,8 @@ BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
|
||||
BuildRequires: ghostscript-devel, djvulibre-devel
|
||||
BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel
|
||||
BuildRequires: libX11-devel, libXext-devel, libXt-devel
|
||||
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
|
||||
BuildRequires: fftw-devel
|
||||
BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
|
||||
BuildRequires: fftw-devel, OpenEXR-devel, libwebp-devel
|
||||
|
||||
%description
|
||||
ImageMagick is an image display and manipulation tool for the X
|
||||
@ -41,15 +41,9 @@ ImageMagick-devel as well.
|
||||
Summary: Library links and header files for ImageMagick app development
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libX11-devel, libXext-devel, libXt-devel
|
||||
Requires: ghostscript-devel
|
||||
Requires: bzip2-devel
|
||||
Requires: freetype-devel
|
||||
Requires: libtiff-devel
|
||||
Requires: libjpeg-devel
|
||||
Requires: lcms-devel
|
||||
Requires: jasper-devel
|
||||
Requires: pkgconfig
|
||||
Requires: libX11-devel, libXext-devel, libXt-devel, ghostscript-devel
|
||||
Requires: bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel
|
||||
Requires: libwebp-devel, OpenEXR-devel, jasper-devel, pkgconfig
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -157,7 +151,9 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
|
||||
--with-magick_plus_plus \
|
||||
--with-gslib \
|
||||
--with-wmf \
|
||||
--with-lcms \
|
||||
--with-lcms2 \
|
||||
--with-webp \
|
||||
--with-openexr \
|
||||
--with-rsvg \
|
||||
--with-xml \
|
||||
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
|
||||
@ -323,10 +319,16 @@ rm -rf %{buildroot}
|
||||
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
||||
|
||||
%changelog
|
||||
* Wed Jun 12 2013 Pavel Alexeev <Pahan@Hubbitus.info> - 6.5.5.10-1
|
||||
- Update to 6.8.5-10 upstream version (bz#720285).
|
||||
- By Remi Collet request (bz#969760) enable those features in ImageMagick:
|
||||
--with-lcms2 (instead of --with-lcms): lcms2-devel
|
||||
--with-openexr: OpenEXR-devel
|
||||
--with-webp: libwebp-devel
|
||||
|
||||
* Thu Apr 18 2013 Pavel Alexeev <Pahan@Hubbitus.info> - 6.8.3.9-2
|
||||
- Enable fftw to do Fourier transforms (add BuildRequires: fftw-devel) - bz#950254 by Søren Sandmann Pedersen request.
|
||||
|
||||
|
||||
* Sun Mar 10 2013 Pavel Alexeev <Pahan@Hubbitus.info> - 6.8.3.9-1
|
||||
- Update to 6.8.3-9 (so-naming scheme change to *-6.so) (ml: http://www.mail-archive.com/devel@lists.fedoraproject.org/msg57163.html).
|
||||
- Split out libs subpackage by Remi Collet request (bz#849065).
|
||||
@ -503,6 +505,10 @@ rm -rf %{buildroot}
|
||||
|
||||
* Sun Jul 27 2008 Hans de Goede <jwrdegoede@fedoraproject.org> 6.4.0.10-2
|
||||
- Fix ownership of /usr/include/ImageMagick (bz 444647)
|
||||
- By Remi request (bz#969760) enable those features in ImageMagick:
|
||||
--with-lcms2 (instead of --with-lcms): lcms2-devel
|
||||
--with-openexr: OpenEXR-devel
|
||||
--with-webp: libwebp-devel
|
||||
|
||||
* Sat Apr 26 2008 Hans de Goede <jwrdegoede@fedoraproject.org> 6.4.0.10-1
|
||||
- New upstream release 6.4.0.10
|
||||
|
Loading…
Reference in New Issue
Block a user