From 2ef3e6fb5c69ae9ee77cca41c52657c5520835f2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 5 Aug 2001 11:49:28 +0000 Subject: [PATCH] - 5.3.7, updated libpath patch, added amfix patch - removed perl-link patch (integrated into libpath patch) Changed files: ImageMagick-amfix.patch -> 1.1 ImageMagick-libpath.patch -> 1.7 ImageMagick-perl-link.patch -> 1.3 ImageMagick.spec -> 1.94 --- ImageMagick-amfix.patch | 57 +++++++++++++++++++++++++++++++++++++ ImageMagick-libpath.patch | 8 +++--- ImageMagick-perl-link.patch | 11 ------- ImageMagick.spec | 12 ++++---- 4 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 ImageMagick-amfix.patch delete mode 100644 ImageMagick-perl-link.patch diff --git a/ImageMagick-amfix.patch b/ImageMagick-amfix.patch new file mode 100644 index 0000000..a87234c --- /dev/null +++ b/ImageMagick-amfix.patch @@ -0,0 +1,57 @@ +--- ImageMagick-5.3.7/coders/Makefile.am.orig Sun Aug 5 12:52:31 2001 ++++ ImageMagick-5.3.7/coders/Makefile.am Sun Aug 5 13:00:53 2001 +@@ -68,7 +68,7 @@ + pkgdata_DATA = + + # Modules which are to be built +-pkg_LTLIBRARIES = 8bim.la art.la avi.la avs.la bmp.la cmyk.la cut.la \ ++pkg_LTLIBRARIES = bim8.la art.la avi.la avs.la bmp.la cmyk.la cut.la \ + dcm.la dps.la dpx.la ept.la fax.la fpx.la fits.la gif.la gray.la gradient.la \ + hdf.la histogram.la html.la icm.la icon.la iptc.la jbig.la jpeg.la jp2.la \ + label.la logo.la map.la matte.la miff.la mono.la mpc.la mtv.la mvg.la \ +@@ -97,9 +97,9 @@ + avs_la_LIBADD = ../magick/libMagick.la + + # BIM module +-8bim_la_SOURCES = 8bim.c +-8bim_la_LDFLAGS = -no-undefined -module -avoid-version +-8bim_la_LIBADD = ../magick/libMagick.la ++bim8_la_SOURCES = 8bim.c ++bim8_la_LDFLAGS = -no-undefined -module -avoid-version ++bim8_la_LIBADD = ../magick/libMagick.la + + # BMP module + bmp_la_SOURCES = bmp.c +--- ImageMagick-5.3.7/Makefile.am.orig Sun Aug 5 12:52:31 2001 ++++ ImageMagick-5.3.7/Makefile.am Sun Aug 5 13:03:07 2001 +@@ -32,7 +32,7 @@ + # bug tracking system at http://www.imagemagick.org/ImageMagick/bugs. + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.4 dist-zip dist-bzip2 foreign ++AUTOMAKE_OPTIONS = 1.4 dist-zip foreign + + # Subdirectories to build + if WITH_MAGICK_PLUS_PLUS +--- ImageMagick-5.3.7/utilities/Makefile.am.orig Wed Jul 25 22:58:53 2001 ++++ ImageMagick-5.3.7/utilities/Makefile.am Sun Aug 5 13:18:35 2001 +@@ -50,7 +50,7 @@ + X11PROGRAMS = + MANPAGES = $(STDMANPAGES) + endif +-bin_PROGRAMS = composite convert identify iptcutil mogrify montage $(X11PROGRAMS) ++bin_PROGRAMS = composite convert identify mogrify montage $(X11PROGRAMS) + + # Libtool libraries, dependencies, and linker flags used by most executables + if WITH_MODULES +@@ -85,10 +85,6 @@ + import_LDFLAGS = $(COMMONLDFLAGS) + import_SOURCES = import.c + +-iptcutil_LDADD = # Don't use ImageMagick LIBS +-iptcutil_LDFLAGS = # Don't use ImageMagick LDFLAGS +-iptcutil_SOURCES = iptcutil.c +- + mogrify_LDADD = $(COMMONLDADD) + mogrify_LDFLAGS = $(COMMONLDFLAGS) + mogrify_SOURCES = mogrify.c diff --git a/ImageMagick-libpath.patch b/ImageMagick-libpath.patch index a503137..7853e8e 100644 --- a/ImageMagick-libpath.patch +++ b/ImageMagick-libpath.patch @@ -1,11 +1,11 @@ ---- ImageMagick-5.3.4/PerlMagick/Makefile.PL.in.orig Tue May 15 23:04:15 2001 -+++ ImageMagick-5.3.4/PerlMagick/Makefile.PL.in Sat Jun 2 19:44:42 2001 +--- ImageMagick-5.3.7/PerlMagick/Makefile.PL.in.orig Tue May 15 23:04:15 2001 ++++ ImageMagick-5.3.7/PerlMagick/Makefile.PL.in Sat Jun 2 19:44:42 2001 @@ -6,7 +6,7 @@ WriteMakefile( 'NAME' => 'Image::Magick', 'VERSION_FROM' => 'Magick.pm', # finds $VERSION -- 'LIBS' => ['@LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'], -+ 'LIBS' => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'], +- 'LIBS' => ['@LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_JP2@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'], ++ 'LIBS' => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_JP2@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@ @LIB_WMF@'], 'DEFINE' => '@DEFS@', # e.g., '-DHAVE_SOMETHING' 'INC' => '-I../ -I@top_srcdir@ @CPPFLAGS@', ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()), diff --git a/ImageMagick-perl-link.patch b/ImageMagick-perl-link.patch deleted file mode 100644 index 8d11027..0000000 --- a/ImageMagick-perl-link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ImageMagick-5.3.4/PerlMagick/Makefile.PL.in.orig Sat Jun 2 19:45:35 2001 -+++ ImageMagick-5.3.4/PerlMagick/Makefile.PL.in Sat Jun 2 19:46:39 2001 -@@ -6,7 +6,7 @@ - WriteMakefile( - 'NAME' => 'Image::Magick', - 'VERSION_FROM' => 'Magick.pm', # finds $VERSION -- 'LIBS' => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@'], -+ 'LIBS' => ['-L@top_srcdir@/magick/.libs @LDFLAGS@ @MAGICKLIB@ @LIB_JBIG@ @LIB_HDF@ @LIB_LCMS@ @LIB_TIFF@ @LIB_TTF@ @LIB_JPEG@ @LIB_GS@ @LIB_PNG@ @LIB_FPX@ @LIB_DPS@ @LIB_XEXT@ @LIB_XT@ @LIB_X11@ @LIB_BZLIB@ @LIB_XML@ @LIB_ZLIB@ @LIB_THREAD@ @LIB_LF@ @LIB_MATH@ @LIB_WMF@'], - 'DEFINE' => '@DEFS@', # e.g., '-DHAVE_SOMETHING' - 'INC' => '-I../ -I@top_srcdir@ @CPPFLAGS@', - ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()), diff --git a/ImageMagick.spec b/ImageMagick.spec index 3fb4264..f903338 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -5,7 +5,7 @@ Summary(fr): Visualisation, conversion, et manipulation d'images sous X Summary(pl): Narzêdzie do wy¶wietlania, konwersji i manipulacji grafikami Summary(tr): X altýnda resim gösterme, çevirme ve deðiþiklik yapma Name: ImageMagick -Version: 5.3.6 +Version: 5.3.7 Release: 1 Epoch: 1 License: Freeware @@ -16,8 +16,8 @@ Source0: ftp://ftp.simplesystems.org/pub/ImageMagick/%{name}-%{version}.tar.gz Patch0: %{name}-libpath.patch Patch1: %{name}-perlpaths.patch Patch2: %{name}-libwmf.patch -Patch3: %{name}-perl-link.patch -Patch4: %{name}-DESTDIR.patch +Patch3: %{name}-DESTDIR.patch +Patch4: %{name}-amfix.patch URL: http://www.imagemagick.org/ BuildRequires: rpm-perlprov >= 3.0.3-18 BuildRequires: XFree86-devel @@ -225,8 +225,6 @@ Biblioteka Magick++ w wersji statycznej. %patch3 -p1 %patch4 -p1 -# fix typo -perl -pi -e 's@htmlc\.@html.c@' coders/Makefile.am # fix lcms.h include path perl -pi -e 's@lcms/lcms\.h@lcms.h@' magick/transform.c @@ -280,13 +278,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/ImageMagick/*.mgk %attr(755,root,root) %{_bindir}/animate -%attr(755,root,root) %{_bindir}/cgimagick +#%attr(755,root,root) %{_bindir}/cgimagick %attr(755,root,root) %{_bindir}/composite %attr(755,root,root) %{_bindir}/convert %attr(755,root,root) %{_bindir}/display %attr(755,root,root) %{_bindir}/identify %attr(755,root,root) %{_bindir}/import -%attr(755,root,root) %{_bindir}/iptcutil +#%attr(755,root,root) %{_bindir}/iptcutil %attr(755,root,root) %{_bindir}/mogrify %attr(755,root,root) %{_bindir}/montage -- 2.44.0