[packages/ImageMagick] up to 6.7.9-10
glen
glen at pld-linux.org
Wed Mar 20 00:01:41 CET 2013
commit e93688cd10f79430f4c3dbb2bf1941571d757621
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 20 00:58:52 2013 +0200
up to 6.7.9-10
sRGB.icc has been removed from IM distribution: an unfriendly license, remove it.
ImageMagick-link.patch | 15 +++++++--------
ImageMagick.spec | 31 ++++++++++++++++++-------------
2 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 988229b..9ff1b58 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,6 +1,12 @@
# TODO
# - remove magick/quantum-private.h when koffice 1.6 is fixed not to use it
-# - bundles sRGB.icc (Microsoft ICM Color Profile), suggest shared-color-profiles instead?
+# - unpackaged:
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/fd.la
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/fd.so
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/jnx.la
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/jnx.so
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/pango.la
+# /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/pango.so
#
# Conditional build:
%bcond_without djvu # without DJVU module
@@ -14,8 +20,8 @@
%bcond_without exr # without OpenEXR module
%include /usr/lib/rpm/macros.perl
-%define ver 6.7.5
-%define pver 9
+%define ver 6.7.9
+%define pver 10
%define QuantumDepth 16
Summary: Image display, conversion, and manipulation under X
Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -28,18 +34,18 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window
Name: ImageMagick
Version: %{ver}%{?pver:.%{pver}}
-Release: 4
+Release: 0.1
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
-Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: d1bf4638d244569f4b2c9c458fb568a8
+Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/legacy/%{name}-%{ver}-%{pver}.tar.xz
+# Source0-md5: e6c4da963f7651674dca48f2b9f575bb
Patch0: %{name}-ac.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-lt.patch
-Patch5: agread-param.patch
+Patch5: agread-param.patch
URL: http://www.imagemagick.org/
BuildRequires: OpenEXR-devel >= 1.0.6
BuildRequires: autoconf >= 2.67
@@ -81,6 +87,7 @@ BuildRequires: xz
BuildRequires: xz-devel
BuildRequires: zlib-devel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Suggests: shared-color-profiles
Obsoletes: ImageMagick-coder-dps
Obsoletes: ImageMagick-coder-mpeg
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -667,19 +674,18 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
--with-threads \
--with-x
-%{__make} -j 1
-%{__perl} -pi -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
+%{__make} -j1
+%{__sed} -i -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__make} -j 1 install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
pkgdocdir=%{_docdir}/%{name}-doc-%{version}
-install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/ImageMagick/{ChangeLog,LICENSE,NEWS.txt}
+cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -705,7 +711,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ImageMagick-%{ver}/*.xml
%dir %{_sysconfdir}/ImageMagick
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick/*.xml
-%{_sysconfdir}/ImageMagick/sRGB.icc
# ========= coders without additional deps
%attr(755,root,root) %{modulesdir}/coders/aai.so
diff --git a/ImageMagick-link.patch b/ImageMagick-link.patch
index 1f8af06..b138438 100644
--- a/ImageMagick-link.patch
+++ b/ImageMagick-link.patch
@@ -1,5 +1,5 @@
---- ImageMagick-6.6.9-4/configure.ac~ 2011-04-15 12:50:38.545397186 +0200
-+++ ImageMagick-6.6.9-4/configure.ac 2011-04-15 12:56:25.068742306 +0200
+--- ImageMagick-6.7.9-10/configure.ac~ 2013-03-20 00:00:39.000000000 +0200
++++ ImageMagick-6.7.9-10/configure.ac 2013-03-20 00:03:56.927315607 +0200
@@ -1369,7 +1369,7 @@
AC_MSG_CHECKING([for X11])
AC_MSG_RESULT([])
@@ -18,16 +18,15 @@
fi
if test "$no_x" != 'yes'; then
have_x='yes'
-@@ -3661,9 +3661,9 @@
+@@ -3718,9 +3718,9 @@
AC_SUBST(MAGICK_LTDLDEPS)
if test "$with_modules" != 'no'; then
-- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+- MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
++ MAGICK_DEP_LIBS="$LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
else
-- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
-+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
++ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $THREAD_LIBS"
fi
AC_SUBST(MAGICK_DEP_LIBS)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/e93688cd10f79430f4c3dbb2bf1941571d757621
More information about the pld-cvs-commit
mailing list