diff --git a/.cvsignore b/.cvsignore index cb948c5..9c79a36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-5.5.6.tar.bz2 +ImageMagick-5.5.7-15.tar.bz2 diff --git a/ImageMagick-5.5.7-automake.patch b/ImageMagick-5.5.7-automake.patch new file mode 100644 index 0000000..c093169 --- /dev/null +++ b/ImageMagick-5.5.7-automake.patch @@ -0,0 +1,142 @@ +--- ImageMagick-5.5.7/Magick++/bin/Makefile.am.amake 2003-03-25 16:09:40.000000000 +0100 ++++ ImageMagick-5.5.7/Magick++/bin/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2002 + # +-AUTOMAKE_OPTIONS = 1.7 ++AUTOMAKE_OPTIONS = 1.6 + + INCLUDES = -I../.. -I$(top_srcdir) + +--- ImageMagick-5.5.7/Magick++/lib/Magick++/Makefile.am.amake 2003-05-11 06:07:47.000000000 +0200 ++++ ImageMagick-5.5.7/Magick++/lib/Magick++/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002 + # +-AUTOMAKE_OPTIONS = 1.7 ++AUTOMAKE_OPTIONS = 1.6 + + includedir = ${prefix}/include + pkgdatadir = $(datadir)/Magick++ +--- ImageMagick-5.5.7/Magick++/lib/Makefile.am.amake 2003-05-31 16:53:42.000000000 +0200 ++++ ImageMagick-5.5.7/Magick++/lib/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003 + # +-AUTOMAKE_OPTIONS = 1.7 nostdinc ++AUTOMAKE_OPTIONS = 1.6 nostdinc + + SUBDIRS = Magick++ + +--- ImageMagick-5.5.7/Magick++/tests/Makefile.am.amake 2003-05-06 17:15:08.000000000 +0200 ++++ ImageMagick-5.5.7/Magick++/tests/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2002 + # +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/magick -I$(top_builddir)/magick + +--- ImageMagick-5.5.7/Magick++/demo/Makefile.am.amake 2003-05-06 17:08:22.000000000 +0200 ++++ ImageMagick-5.5.7/Magick++/demo/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002 + # +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + INCLUDES = -I$(srcdir)/../lib -I../.. -I$(top_srcdir) + +--- ImageMagick-5.5.7/Magick++/Makefile.am.amake 2003-03-25 16:09:40.000000000 +0100 ++++ ImageMagick-5.5.7/Magick++/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -3,7 +3,7 @@ + # + # Copyright Bob Friesenhahn, 1999, 2000, 2002 + # +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + # Additional files to distribute + EXTRA_DIST = +--- ImageMagick-5.5.7/coders/Makefile.am.amake 2003-05-12 22:00:59.000000000 +0200 ++++ ImageMagick-5.5.7/coders/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -32,7 +32,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick + +--- ImageMagick-5.5.7/magick/Makefile.am.amake 2003-05-31 16:52:41.000000000 +0200 ++++ ImageMagick-5.5.7/magick/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -29,7 +29,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + includedir = ${prefix}/include + pkgincludedir = $(includedir)/magick +--- ImageMagick-5.5.7/filters/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 ++++ ImageMagick-5.5.7/filters/Makefile.am 2003-09-10 15:44:59.000000000 +0200 +@@ -29,7 +29,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick + +--- ImageMagick-5.5.7/locale/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 ++++ ImageMagick-5.5.7/locale/Makefile.am 2003-09-10 15:45:03.000000000 +0200 +@@ -29,7 +29,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + # Where locale modules are installed + pkgdir = @MagickLibPath@ +--- ImageMagick-5.5.7/utilities/Makefile.am.amake 2003-03-25 16:10:38.000000000 +0100 ++++ ImageMagick-5.5.7/utilities/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -29,7 +29,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + MAGICK_LIB = ../magick/libMagick.la # libtool library name + INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick +--- ImageMagick-5.5.7/tests/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 ++++ ImageMagick-5.5.7/tests/Makefile.am 2003-09-10 15:45:07.000000000 +0200 +@@ -1,6 +1,6 @@ + # Makefile written by Bob Friesenhahn + +-AUTOMAKE_OPTIONS = 1.7 foreign ++AUTOMAKE_OPTIONS = 1.6 foreign + + INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick + #INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/magick +--- ImageMagick-5.5.7/Makefile.am.amake 2003-05-15 17:24:39.000000000 +0200 ++++ ImageMagick-5.5.7/Makefile.am 2003-09-10 15:44:00.000000000 +0200 +@@ -2,7 +2,7 @@ + # + + # Don't require all the GNU mandated files +-AUTOMAKE_OPTIONS = 1.7.2 dist-zip dist-bzip2 foreign ++AUTOMAKE_OPTIONS = 1.6 dist-zip dist-bzip2 foreign + + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ diff --git a/ImageMagick-5.5.7-stdin.patch b/ImageMagick-5.5.7-stdin.patch new file mode 100644 index 0000000..3beb113 --- /dev/null +++ b/ImageMagick-5.5.7-stdin.patch @@ -0,0 +1,30 @@ +--- ImageMagick-5.5.7/magick/command.c.stdin 2003-09-10 08:59:31.000000000 +0200 ++++ ImageMagick-5.5.7/magick/command.c 2003-09-10 09:01:42.000000000 +0200 +@@ -4410,7 +4410,8 @@ + *client_name, + *option, + *resource_value, +- *server_name; ++ *server_name, ++ c_tmp; + + Display + *display; +@@ -4549,7 +4550,16 @@ + break; + else + if (!isatty(STDIN_FILENO)) +- option=(char *) "-"; ++ { ++ c_tmp = getc(stdin); ++ if(c_tmp != EOF) ++ { ++ ungetc(c_tmp, stdin); ++ option=(char *) "-"; ++ } else ++ option=(char *) "logo:Untitled"; ++ /* option=(char *) "-"; */ ++ } + else + option=(char *) "logo:Untitled"; + if ((strlen(option) == 1) || ((*option != '-') && (*option != '+'))) diff --git a/ImageMagick.spec b/ImageMagick.spec index eb82012..66d43ca 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ # ImageMagick has adopted a new Version.Patchlevel version numbering system... # 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 5.5.6 -%define Patchlevel %{nil} +%define VER 5.5.7 +%define Patchlevel 15 Summary: An X application for displaying and manipulating images. Name: ImageMagick %if "%{Patchlevel}" != "" @@ -9,13 +9,13 @@ Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 5 +Release: 0.2 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 %else -Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 %endif Source1: magick_small.png Patch1: ImageMagick-5.5.6-lprhack.patch @@ -23,15 +23,15 @@ Patch2: ImageMagick-5.3.6-nonroot.patch Patch3: ImageMagick-5.3.7-config.patch Patch4: ImageMagick-5.5.6-hp2xx.patch Patch5: ImageMagick-5.4.7-localdoc.patch -Patch6: ImageMagick-5.4.7-stdin.patch -Patch7: ImageMagick-5.5.6-automake.patch +Patch6: ImageMagick-5.5.7-stdin.patch +Patch7: ImageMagick-5.5.7-automake.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, perl Requires: bzip2, freetype, libjpeg, libpng, libtiff, libungif, zlib BuildRequires: freetype-devel >= 2.0.1 - +BuildRequires: automake >= 1.6 autoconf >= 2.57 libtool >= 1.5 %description ImageMagick(TM) is an image display and manipulation tool for the X @@ -113,10 +113,10 @@ however. %patch4 -p1 -b .hp2xx %patch5 -p1 -b .ImageMagick %patch6 -p1 -b .stdin -%patch7 -p1 -b .amake +#%patch7 -p1 -b .amake %build -libtoolize --force +libtoolize --copy --force aclocal automake || : autoconf || : @@ -127,20 +127,21 @@ autoconf || : --with-magick_plus_plus make +# Link against built not installed library +%define perl_make_options CC='%__cc -L$PWD/magick/.libs' LD='%__ld -L$PWD/magick/.libs' +make PERL_MAKE_OPTIONS="%perl_make_options" PerlMagick/Makefile +make -C PerlMagick + %install 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;s,^INSTALLSITEARCH = /usr,INSTALLSITEARCH = \$(DESTDIR)/usr,g' PerlMagick/Makefile -perl -pi -e "s,-lMagick,-L../magick/.libs -lMagick,g" PerlMagick/Makefile cat >>PerlMagick/Makefile < perl-pkg-files find $RPM_BUILD_ROOT%{_libdir}/perl$perlmajor/site_perl/$perlver -type d -name Image >> perl-pkg-files.orig sed -e s,$RPM_BUILD_ROOT,, perl-pkg-files.orig > perl-pkg-files @@ -200,6 +202,7 @@ sed -e s,$RPM_BUILD_ROOT,, perl-pkg-files.orig > perl-pkg-files # remove files we aren't shipping rm -f `find $RPM_BUILD_ROOT%{_libdir}/perl$perlmajor/ -name perllocal.pod -type f` rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER} %clean #rm -rf $RPM_BUILD_ROOT @@ -214,9 +217,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick %files %defattr(-,root,root) -%doc www images -%doc README.txt ImageMagick.html -%attr(755,root,root) %{_libdir}/libMagick-*.so.* +%doc index.html www images Copyright.txt QuickStart.txt +%doc README.txt +%attr(755,root,root) %{_libdir}/libMagick.so.* %{_libdir}/ImageMagick-* %{_bindir}/[a-z]* %{_mandir}/*/* @@ -230,11 +233,12 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick %{_libdir}/libMagick.a %{_libdir}/libMagick.la %{_libdir}/libMagick.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/magick %files c++ %defattr(-,root,root) -%{_libdir}/libMagick++-*.so.* +%{_libdir}/libMagick++.so.* %files c++-devel %defattr(-,root,root) @@ -251,6 +255,22 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick #%{_libdir}/perl*/site_perl/*/*/Image %changelog +* Sun Jan 25 2004 Nils Philippsen 5.5.7.15-0.2 +- make perl module link against the built library instead of the installed one + +* Thu Jan 22 2004 Nils Philippsen 5.5.7.15-0.1 +- version 5.5.7 patchlevel 15 + +* Mon Oct 13 2003 Nils Philippsen 5.5.7.10-0.1 +- rebuild with release 0.1 to not block an official update package + +* Wed Sep 10 2003 Nils Philippsen 5.5.7.10-2 +- hack around libtool stupidity +- disable automake patch as we require automake-1.7 anyway + +* Wed Sep 10 2003 Nils Philippsen 5.5.7.10-1 +- version 5.5.7 patchlevel 10 + * Wed Jun 04 2003 Elliot Lee - rebuilt diff --git a/sources b/sources index 0f72536..3a66237 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eac3971f0704059dcf2f7a5737b7daa8 ImageMagick-5.5.6.tar.bz2 +6780f81dee32f1e8d2f277b6fe621955 ImageMagick-5.5.7-15.tar.bz2