diff --git a/.cvsignore b/.cvsignore index 85b82b0..763a1f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-5.2.7.tar.bz2 +ImageMagick-5.3.7.tar.bz2 diff --git a/ImageMagick-5.3.6-nonroot.patch b/ImageMagick-5.3.6-nonroot.patch new file mode 100644 index 0000000..fa98ca2 --- /dev/null +++ b/ImageMagick-5.3.6-nonroot.patch @@ -0,0 +1,11 @@ +--- ImageMagick-5.3.6/Makefile.am.nonroot Thu Jun 14 17:54:36 2001 ++++ ImageMagick-5.3.6/Makefile.am Mon Jul 9 14:34:35 2001 +@@ -74,7 +74,7 @@ + # + + # Install HTML files +-pkgdocdir = @MagickSharePath@ ++pkgdocdir = $(DESTDIR)/@MagickSharePath@ + DOCDIRS = images www www/api www/api/types www/Magick++ + install-data-html: + $(mkinstalldirs) $(pkgdocdir) diff --git a/ImageMagick-5.3.7-config.patch b/ImageMagick-5.3.7-config.patch new file mode 100644 index 0000000..8347787 --- /dev/null +++ b/ImageMagick-5.3.7-config.patch @@ -0,0 +1,22 @@ +--- ImageMagick-5.3.7/Magick++/lib/Magick++/Makefile.am.orig Sun Aug 12 20:44:08 2001 ++++ ImageMagick-5.3.7/Magick++/lib/Magick++/Makefile.am Sun Aug 12 20:44:21 2001 +@@ -5,7 +5,7 @@ + # + AUTOMAKE_OPTIONS = 1.4 + +-includedir = ${prefix}/include ++includedir = ${prefix}/include/X11/magick + pkgdatadir = $(datadir)/Magick++ + pkglibdir = $(libdir)/Magick++ + pkgincludedir = $(includedir)/Magick++ +--- ImageMagick-5.3.7/Magick++/lib/Makefile.am.orig Sun Aug 12 20:40:56 2001 ++++ ImageMagick-5.3.7/Magick++/lib/Makefile.am Sun Aug 12 20:42:22 2001 +@@ -9,7 +9,7 @@ + + INCLUDES = -I../.. -I$(top_srcdir) + +-includedir = ${prefix}/include ++includedir = ${prefix}/include/X11/magick + pkgdatadir = $(datadir)/Magick++ + pkglibdir = $(libdir)/Magick++ + pkgincludedir = $(includedir)/Magick++ diff --git a/ImageMagick.spec b/ImageMagick.spec index 21a4492..a6509cb 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,57 +1,70 @@ Summary: An X application for displaying and manipulating images. Name: ImageMagick -Version: 5.2.7 -Release: 4 -Copyright: freeware +Version: 5.3.7 +Release: 3 +License: freeware Group: Applications/Multimedia Source: ftp://ftp.cdrom.com/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 -Patch0: ImageMagick-5.2.6-libpath.patch -Patch1: ImageMagick-5.2.4-lprhack.patch +Source1: magick_small.png +Patch1: ImageMagick-5.3.5-lprhack.patch +Patch2: ImageMagick-5.3.6-nonroot.patch +Patch3: ImageMagick-5.3.7-builddep.patch +Patch4: ImageMagick-5.3.7-config.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildPrereq: libtiff-devel, libungif-devel, zlib-devel +BuildPrereq: libtiff-devel, libungif-devel, zlib-devel, perl Requires: bzip2, freetype, libjpeg, libpng, libtiff, libungif, zlib BuildRequires: freetype-devel >= 2.0.1 -Prefix: /usr/X11R6 %define _prefix /usr/X11R6 %define _mandir %{_prefix}/man %define _includedir %{_prefix}/include/X11/magick %description -ImageMagick(TM) is an image display and manipulation tool for the X -Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF -and Photo CD image formats. It can resize, rotate, sharpen, color -reduce or add special effects to an image, and when finished you can -either save the completed work in the original format or a different -one. ImageMagick also includes command line programs for creating -animated or transparent .gifs, creating composite images, creating -thumbnail images, and more. - -ImageMagick is one of your choices if you need a program to manipulate -and display images. If you'd also like to develop your own applications -which use ImageMagick code or APIs, you'll need to install +ImageMagick(TM) is an image display and manipulation tool for the X +Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, +and Photo CD image formats. It can resize, rotate, sharpen, color +reduce, or add special effects to an image, and when finished you can +either save the completed work in the original format or a different +one. ImageMagick also includes command line programs for creating +animated or transparent .gifs, creating composite images, creating +thumbnail images, and more. + +ImageMagick is one of your choices if you need a program to manipulate +and dis play images. If you want to develop your own applications +which use ImageMagick code or APIs, you need to install ImageMagick-devel as well. %package devel Summary: Static libraries and header files for ImageMagick app development. Group: Development/Libraries -Requires: ImageMagick = %{version} +Requires: ImageMagick = %{version}-%{release} %description devel Image-Magick-devel contains the static libraries and header files you'll -need to develop ImageMagick applications. ImageMagick is an image +need to develop ImageMagick applications. ImageMagick is an image manipulation program. -If you want to create applications that will use ImageMagick code -or APIs, you'll need to install ImageMagick-devel as well as ImageMagick. -You don't need to install it if you just want to use ImageMagick, +If you want to create applications that will use ImageMagick code or +APIs, you need to install ImageMagick-devel as well as ImageMagick. +You do noy need to install it if you just want to use ImageMagick, however. +%package perl +Summary: ImageMagick perl bindings +Group: System Environment/Libraries +Requires: ImageMagick = %{version}-%{release}, perl >= 5.6.0 + +%description perl +Perl bindings to ImageMagick. + +Install ImageMagick-perl if you want to use any perl scripts that use +ImageMagick. + %package c++ -Summary: ImageMagick Magick++ library +Summary: ImageMagick Magick++ library (C++ bindings) Group: System Environment/Libraries -Requires: ImageMagick = %{version} +Requires: ImageMagick = %{version}-%{release} %description c++ This package contains the Magick++ library, a C++ binding to the ImageMagick @@ -78,41 +91,55 @@ however. %prep %setup -q -%patch0 -p1 -b .path %patch1 -p1 -b .lpr - -rm -f images/Makefile || : +%patch2 -p1 -b .nonroot +%patch3 -p1 -b .bdep +%patch4 -p1 -b .config %build -TARGET_PLATFORM=%{_target_platform} -%define _target_platform --target=$TARGET_PLATFORM -%ifarch alpha sparc -RPM_OPT_FLAGS="" -%endif - -%ifarch ia64 -CFLAGS="-g -D_GNU_SOURCE $RPM_OPT_FLAGS"; export CFLAGS -%else -CFLAGS="-g $RPM_OPT_FLAGS"; export CFLAGS -%endif -mv configure.in configure.in.dontuse # HACK: Don't run libtoolize in %%configure -%configure --prefix=/usr/X11R6 --enable-shared --with-perl --with-x --with-threads --with-magick_plus_plus --without-wmf -mv configure.in.dontuse configure.in +libtoolize --force +aclocal +automake || : +autoconf +%configure --prefix=%{_prefix} --enable-shared \ + --with-perl --with-x \ + --with-threads --with-magick_plus_plus make -make -C Magick++ %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%makeinstall PREFIX=$RPM_BUILD_ROOT/usr -%makeinstall -C Magick++ PREFIX=$RPM_BUILD_ROOT/usr - -for bin in $RPM_BUILD_ROOT%{_bindir}/*-*-*-* $RPM_BUILD_ROOT%{_mandir}/man*/*-*-*-* ; do - mv ${bin} `echo ${bin} | sed 's@[^-/]*-[^-/]*-[^-/]*-@@g'` -done -install -m755 utilities/.libs/* $RPM_BUILD_ROOT%{_bindir}/ +rm -rf $RPM_BUILD_ROOT + +make PerlMagick/Makefile +perl -pi -e 's,^PREFIX.*,PREFIX = \$(DESTDIR)/usr,g;s,^config :: Makefile,config :: ,g;s,Makefile : ,Foo : ,g' PerlMagick/Makefile +perl -pi -e "s,-lMagick,-L../magick/.libs -lMagick,g" PerlMagick/Makefile +cat >>PerlMagick/Makefile <$RPM_BUILD_ROOT/etc/X11/applnk/Graphics/ImageMagick.desktop < -- rebuild for C++ exception handling on ia64 -- fix build (need -D_GNU_SOURCE at least on ia64...) -- explicitly disable libwmf support +* Sun Aug 12 2001 Than Ngo 5.3.7-3 +- fix to build Perlmagic on s390 s390x + +* Thu Jul 26 2001 Bernhard Rosenkraenzer 5.3.7-2 +- Add delegates.mgk to the package (#50725) + +* Tue Jul 24 2001 Bernhard Rosenkraenzer 5.3.7-1 +- Fix build without previously installed ImageMagick-devel (#49816) +- Move perl bindings to a separate package. + +* Mon Jul 9 2001 Bernhard Rosenkraenzer 5.3.6-2 +- Fix build as non-root again +- Shut up rpmlint + +* Tue Jul 3 2001 Bernhard Rosenkraenzer 5.3.6-1 +- 5.3.6 +- Get rid of the ia64 patch, it's no longer needed since glibc was fixed + +* Sat Jun 16 2001 Than Ngo +- update to 5.3.5 +- cleanup specfile + +* Sat May 19 2001 Bernhard Rosenkraenzer 5.3.3-2 +- 5.3.3-respin, fixes #41196 + +* Tue May 1 2001 Bernhard Rosenkraenzer 5.3.3-1 +- 5.3.3 +- Add a desktop file for "display" (RFE#17417) + +* Sun Apr 15 2001 Bernhard Rosenkraenzer +- 5.3.2 +- work around bugs in ia64 glibc headers * Mon Jan 08 2001 Florian La Roche - remove patch for s390, it is not necessary diff --git a/magick_small.png b/magick_small.png new file mode 100644 index 0000000..7d9b6cc Binary files /dev/null and b/magick_small.png differ diff --git a/sources b/sources index 77902fc..5150358 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ded2c3a4cb5e94f48cd48451e7b7fbe4 ImageMagick-5.2.7.tar.bz2 +bfdee47f1dec8234aa2f3a98b059be1b ImageMagick-5.3.7.tar.bz2