From 91ebc384696c56d45b6a85363c19ff8a6b28a9e3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Apr 2005 14:57:56 +0000 Subject: [PATCH] 6.2.1 --- .cvsignore | 1 + ImageMagick-6.2.0-compress.patch | 46 ++++++++ ImageMagick-6.2.1-fixed.patch | 13 +++ ImageMagick-6.2.1-gslib.patch | 131 +++++++++++++++++++++ ImageMagick-6.2.1-hp2xx.patch | 14 +++ ImageMagick-6.2.1-local_doc.patch | 33 ++++++ ImageMagick-6.2.1-pkgconfig.patch | 10 ++ ImageMagick.spec | 181 ++++++++++++++---------------- sources | 2 +- 9 files changed, 334 insertions(+), 97 deletions(-) create mode 100644 ImageMagick-6.2.0-compress.patch create mode 100644 ImageMagick-6.2.1-fixed.patch create mode 100644 ImageMagick-6.2.1-gslib.patch create mode 100644 ImageMagick-6.2.1-hp2xx.patch create mode 100644 ImageMagick-6.2.1-local_doc.patch create mode 100644 ImageMagick-6.2.1-pkgconfig.patch diff --git a/.cvsignore b/.cvsignore index 0b3754f..d7892a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ ImageMagick-6.0.7-1.tar.bz2 ImageMagick-6.2.0-7.tar.gz +ImageMagick-6.2.1-7.tar.bz2 diff --git a/ImageMagick-6.2.0-compress.patch b/ImageMagick-6.2.0-compress.patch new file mode 100644 index 0000000..3b896ed --- /dev/null +++ b/ImageMagick-6.2.0-compress.patch @@ -0,0 +1,46 @@ +--- ImageMagick-6.2.0/coders/tiff.c.compress 2005-04-21 15:38:37.378516000 -0400 ++++ ImageMagick-6.2.0/coders/tiff.c 2005-04-21 15:38:58.804069000 -0400 +@@ -1495,7 +1495,6 @@ + compress_tag=COMPRESSION_NONE; + switch (image->compression) + { +-#if defined(CCITT_SUPPORT) + case FaxCompression: + { + if (IsMonochromeImage(image,&image->exception) != MagickFalse) +@@ -1508,35 +1507,28 @@ + compress_tag=COMPRESSION_CCITTFAX4; + break; + } +-#endif +-#if defined(YCBCR_SUPPORT) + case JPEGCompression: + { + compress_tag=COMPRESSION_JPEG; + (void) SetImageDepth(image,8); + break; + } +-#endif +-#if defined(LZW_SUPPORT) + case LZWCompression: + { + if (image_info->compression == LZWCompression) + compress_tag=COMPRESSION_LZW; /* LZW compression must be explicit */ + break; + } +-#endif + case RLECompression: + { + compress_tag=COMPRESSION_PACKBITS; + break; + } +-#if defined(ZIP_SUPPORT) + case ZipCompression: + { + compress_tag=COMPRESSION_ADOBE_DEFLATE; + break; + } +-#endif + default: + { + compress_tag=COMPRESSION_NONE; diff --git a/ImageMagick-6.2.1-fixed.patch b/ImageMagick-6.2.1-fixed.patch new file mode 100644 index 0000000..ece05a6 --- /dev/null +++ b/ImageMagick-6.2.1-fixed.patch @@ -0,0 +1,13 @@ +--- ImageMagick-6.2.1/magick/xwindow.c.fixed 2005-04-25 01:10:47.727810000 -0400 ++++ ImageMagick-6.2.1/magick/xwindow.c 2005-04-25 01:11:01.698825000 -0400 +@@ -779,8 +779,8 @@ + }, + *TextFonts[]= + { +- "-*-fixed-medium-r-normal-*-12-*-*-*-*-*-iso8859-1", +- "-*-fixed-medium-r-normal-*-12-*-*-*-*-*-iso8859-15", ++ "-*-courier-medium-r-normal-*-12-*-*-*-*-*-iso8859-1", ++ "-*-courier-medium-r-normal-*-12-*-*-*-*-*-iso8859-15", + "fixed", + (char *) NULL + }; diff --git a/ImageMagick-6.2.1-gslib.patch b/ImageMagick-6.2.1-gslib.patch new file mode 100644 index 0000000..8a545f0 --- /dev/null +++ b/ImageMagick-6.2.1-gslib.patch @@ -0,0 +1,131 @@ +--- ImageMagick-5.5.7/magick/delegate.h.gs 2003-06-03 12:37:50.000000000 -0500 ++++ ImageMagick-5.5.7/magick/delegate.h 2004-01-20 10:18:57.000000000 -0600 +@@ -9,8 +9,8 @@ + #endif + + #if defined(HasGS) +-#include "ps/iapi.h" +-#include "ps/errors.h" ++#include "ghostscript/iapi.h" ++#include "ghostscript/errors.h" + #endif + + /* +--- ImageMagick-5.5.7/configure.ac.gs 2004-01-20 10:13:27.000000000 -0600 ++++ ImageMagick-5.5.7/configure.ac 2004-01-20 10:15:42.000000000 -0600 +@@ -1349,8 +1349,8 @@ + AC_MSG_RESULT() + failed=0; + passed=0; +- AC_CHECK_HEADER(ps/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) +- AC_CHECK_HEADER(ps/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) ++ AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) ++ AC_CHECK_HEADER(ghostscript/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_CHECK_LIB(gs,gsapi_new_instance,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) + AC_MSG_CHECKING(if Ghostscript library package is complete) + if test $passed -gt 0 +--- ImageMagick-5.5.7/configure.gs 2003-12-17 18:10:55.000000000 -0600 ++++ ImageMagick-5.5.7/configure 2004-01-20 10:18:26.000000000 -0600 +@@ -36513,8 +36513,8 @@ + failed=0; + passed=0; + if test "${ac_cv_header_ps_iapi_h+set}" = set; then +- echo "$as_me:$LINENO: checking for ps/iapi.h" >&5 +-echo $ECHO_N "checking for ps/iapi.h... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for ghostscript/iapi.h" >&5 ++echo $ECHO_N "checking for ghostscript/iapi.h... $ECHO_C" >&6 + if test "${ac_cv_header_ps_iapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +@@ -36522,8 +36522,8 @@ + echo "${ECHO_T}$ac_cv_header_ps_iapi_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking ps/iapi.h usability" >&5 +-echo $ECHO_N "checking ps/iapi.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking ghostscript/iapi.h usability" >&5 ++echo $ECHO_N "checking ghostscript/iapi.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -36531,7 +36531,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -36567,15 +36567,15 @@ + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking ps/iapi.h presence" >&5 +-echo $ECHO_N "checking ps/iapi.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking ghostscript/iapi.h presence" >&5 ++echo $ECHO_N "checking ghostscript/iapi.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -36609,25 +36609,25 @@ + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: ps/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: ps/iapi.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: ps/iapi.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: ps/iapi.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: ps/iapi.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: ps/iapi.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: ps/iapi.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: ps/iapi.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostsript/iapi.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -36638,8 +36638,8 @@ + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for ps/iapi.h" >&5 +-echo $ECHO_N "checking for ps/iapi.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for ghostscript/iapi.h" >&5 ++echo $ECHO_N "checking for ghostscript/iapi.h... $ECHO_C" >&6 + if test "${ac_cv_header_ps_iapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else diff --git a/ImageMagick-6.2.1-hp2xx.patch b/ImageMagick-6.2.1-hp2xx.patch new file mode 100644 index 0000000..6a09c38 --- /dev/null +++ b/ImageMagick-6.2.1-hp2xx.patch @@ -0,0 +1,14 @@ +--- ImageMagick-6.2.1/config/delegates.xml.in.hp2xx 2005-04-24 23:34:14.481721000 -0400 ++++ ImageMagick-6.2.1/config/delegates.xml.in 2005-04-24 23:34:40.886290000 -0400 +@@ -74,10 +74,7 @@ + @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i" + mv -f `basename "%o"` "%o + else +- echo "You need to install hp2xx (which is not part of Red Hat Linux) to use" +- echo "HPGL files with ImageMagick." +- echo "Current hp2xx RPM packages for Red Hat Linux can be found at" +- echo "http://rhcontrib.bero.org/search.php in the Applications/Multimedia section." ++ echo "You need to install hp2xx to use HPGL files with ImageMagick." + exit 1 + fi' /> + diff --git a/ImageMagick-6.2.1-local_doc.patch b/ImageMagick-6.2.1-local_doc.patch new file mode 100644 index 0000000..aea2e39 --- /dev/null +++ b/ImageMagick-6.2.1-local_doc.patch @@ -0,0 +1,33 @@ +--- ImageMagick-6.1.8/configure.ac.local_doc 2005-01-18 10:36:52.264401000 -0600 ++++ ImageMagick-6.1.8/configure.ac 2005-01-18 10:43:20.923316728 -0600 +@@ -1986,7 +1986,7 @@ + # Default delegate definitions + AutotraceDecodeDelegateDefault='autotrace' + BZIPDelegateDefault='bzip2' +-BrowseDelegateDefault='mozilla' ++BrowseDelegateDefault='htmlview' + CGMDecodeDelegateDefault='ralcgm' + CatDelegateDefault='cat' + CRWDecodeDelegateDefault='dcraw' +--- ImageMagick-6.1.8/configure.local_doc 2005-01-13 20:48:03.000000000 -0600 ++++ ImageMagick-6.1.8/configure 2005-01-18 10:43:34.126309568 -0600 +@@ -44627,7 +44627,7 @@ + # Default delegate definitions + AutotraceDecodeDelegateDefault='autotrace' + BZIPDelegateDefault='bzip2' +-BrowseDelegateDefault='mozilla' ++BrowseDelegateDefault='htmlview' + CGMDecodeDelegateDefault='ralcgm' + CatDelegateDefault='cat' + CRWDecodeDelegateDefault='dcraw' +--- ImageMagick-6.1.8/magick/version.h.in.local_doc 2004-12-17 18:28:02.000000000 -0600 ++++ ImageMagick-6.1.8/magick/version.h.in 2005-01-18 10:42:27.712406016 -0600 +@@ -28,7 +28,7 @@ + #define MagickReleaseDate "@PACKAGE_RELEASE_DATE@" + #define MagickVersion MagickPackageName " " MagickLibVersionText " " \ + MagickReleaseDate " " MagickQuantumDepth " " MagickHomeURL +-#define MagickHomeURL "http://www.imagemagick.org" ++#define MagickHomeURL "file:/usr/share/ImageMagick-@PACKAGE_VERSION@/doc/index.html" + + extern MagickExport char + *GetMagickHomeURL(void); diff --git a/ImageMagick-6.2.1-pkgconfig.patch b/ImageMagick-6.2.1-pkgconfig.patch new file mode 100644 index 0000000..da80253 --- /dev/null +++ b/ImageMagick-6.2.1-pkgconfig.patch @@ -0,0 +1,10 @@ +--- ImageMagick-6.1.8/Magick++/lib/ImageMagick++.pc.in.purge 2003-11-01 14:02:49.000000000 -0600 ++++ ImageMagick-6.1.8/Magick++/lib/ImageMagick++.pc.in 2005-01-18 12:55:01.000000000 -0600 +@@ -8,5 +8,5 @@ + Version: @PACKAGE_VERSION@ + Description: Magick++ - Convert, Edit, and Compose Images + Requires: ImageMagick +-Libs: -L${libdir} @MAGICK_LDFLAGS@ @MAGICK_LIBS@ -lMagick++ +-Cflags: -I${includedir} @MAGICK_CPPFLAGS@ ++Libs: -L${libdir} -lMagick++ ++Cflags: -I${includedir} diff --git a/ImageMagick.spec b/ImageMagick.spec index 1bbf283..4daf73e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,6 +1,6 @@ # ImageMagick has adopted a new Version.Patchlevel version numbering system... # 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 6.2.0 +%define VER 6.2.1 %define Patchlevel 7 Summary: An X application for displaying and manipulating images. Name: ImageMagick @@ -9,24 +9,30 @@ Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 2 +Release: 1 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.gz +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 %else -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.gz +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 %endif Source1: magick_small.png -Patch1: ImageMagick-6.2.0-lprhack.patch -Patch2: ImageMagick-6.2.0-hp2xx.patch -Patch3: ImageMagick-6.2.0-vsnprintf.patch +Patch2: ImageMagick-6.2.1-hp2xx.patch +Patch3: ImageMagick-6.2.0-compress.patch +Patch4: ImageMagick-6.2.1-local_doc.patch +Patch6: ImageMagick-6.2.1-pkgconfig.patch +Patch7: ImageMagick-6.2.1-fixed.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 BuildRequires: freetype-devel >= 2.0.1 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 +BuildRequires: ghostscript-devel +BuildRequires: libwmf-devel +BuildRequires: XFree86-devel %description ImageMagick(TM) is an image display and manipulation tool for the X @@ -46,25 +52,27 @@ ImageMagick-devel as well. %package devel Summary: Static libraries and header files for ImageMagick app development. Group: Development/Libraries -Requires: ImageMagick = %{version}-%{release}, bzip2-devel, freetype-devel -Requires: libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel, libxml2-devel -Requires: libexif-devel +Requires: %{name} = %{version}-%{release} Requires: XFree86-devel +Requires: ghostscript-devel %description devel -Image-Magick-devel contains the static libraries and header files you'll +ImageMagick-devel contains the static libraries and header files you'll 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 need to install ImageMagick-devel as well as ImageMagick. -You do noy need to install it if you just want to use ImageMagick, +You do not 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 +Requires: %{name} = %{version}-%{release} +Requires: perl >= 5.6.0 +%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}') +Prereq: %{perl_vendorarch} %description perl Perl bindings to ImageMagick. @@ -75,7 +83,7 @@ ImageMagick. %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Group: System Environment/Libraries -Requires: ImageMagick = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description c++ This package contains the Magick++ library, a C++ binding to the ImageMagick @@ -86,9 +94,8 @@ Install ImageMagick-c++ if you want to use any applications that use Magick++. %package c++-devel Summary: C++ bindings for the ImageMagick library Group: Development/Libraries -Requires: ImageMagick = %{version}, ImageMagick-c++ = %{version} -Requires: ImageMagick-devel = %{version}, bzip2-devel, freetype-devel -Requires: libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel, libxml2-devel +Requires: %{name}-c++ = %{version} +Requires: %{name}-devel = %{version} %description c++-devel ImageMagick-devel contains the static libraries and header files you'll @@ -104,96 +111,67 @@ however. %prep %setup -q -n %{name}-%{VER} -%patch1 -p1 -b .lpr %patch2 -p1 -b .hp2xx -%patch3 -p1 -b .vsnprintf +%patch3 -p1 -b .compress +%patch4 -p1 -b .local_doc +%patch6 -p1 -b .pkgconfig +%patch7 -p1 -b .fixed %build -libtoolize --copy --force -aclocal -automake || : -autoconf || : %configure --enable-shared \ + --with-modules \ --with-perl \ --with-x \ --with-threads \ - --with-magick_plus_plus -make + --with-magick_plus_plus \ + --with-gslib \ + --with-wmf \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LD='%__ld -L$PWD/magick/.libs'" \ + --with-windows-font-dir=%{_datadir}/fonts/default/TrueType -# 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 +make %install rm -rf $RPM_BUILD_ROOT -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 -cat >>PerlMagick/Makefile <$RPM_BUILD_ROOT/etc/X11/applnk/Graphics/ImageMagick.desktop <fixin(@ARGV)' PerlMagick/demo/*.pl -pushd $RPM_BUILD_ROOT/%{_bindir} -for i in %{_target}-redhat-linux-*; do - [ -f $i ] && mv $i `echo $i |sed -e "s/^%{_target}-redhat-linux-//"` -done -popd +# perlmagick: remove special files +find $RPM_BUILD_ROOT%{_libdir}/perl* -name perllocal.pod -o -name .packlist \ + -o -name "*.bs" | xargs -ri rm -f {} -pushd $RPM_BUILD_ROOT/%{_mandir} -for i in */%{_target}-redhat-linux-*; do - [ -f $i ] && mv $i `echo $i |sed -e "s,/%{_target}-redhat-linux-,/,"` -done -popd +# perlmagick: no empty directories +find $RPM_BUILD_ROOT%{_libdir}/perl* -depth -type d -a -empty -exec rmdir {} \; -# get the perl file list. We know what we need, so this is easy -rm -f perl-pkg-files.orig +# perlmagick: build files list echo "%defattr(-,root,root)" > 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 +find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ + | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files +find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ + | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ + | grep -v '^%dir %{perl_vendorarch}$' \ + | grep -v '/auto$' >> perl-pkg-files +if [ -z perl-pkg-files ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi -# 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}/{images,www,ChangeLog,LICENSE,NEWS,index.html} +# Keep config +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/[a-b,d-z,A-Z]* rm -rf $RPM_BUILD_ROOT%{_libdir}/libltdl.* +rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +# link docs +ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/ImageMagick-%{VER}/doc %clean rm -rf $RPM_BUILD_ROOT @@ -208,30 +186,31 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc index.html www images QuickStart.txt +%doc index.html www/ images/ +%doc QuickStart.txt ChangeLog Platforms.txt %doc README.txt LICENSE NOTICE AUTHORS NEWS %attr(755,root,root) %{_libdir}/libMagick.so.* %attr(755,root,root) %{_libdir}/libWand.so.* -%{_libdir}/ImageMagick-%{VER} -%{_datadir}/ImageMagick-%{VER}/config %{_bindir}/[a-z]* -%{_mandir}/*/* -#/etc/X11/applnk/Graphics/ImageMagick.desktop -#/usr/share/icons/magick_small.png +%{_libdir}/ImageMagick* +%{_datadir}/ImageMagick* +%{_mandir}/man[145]/[a-z]* +%{_mandir}/man1/ImageMagick.* %files devel %defattr(-,root,root) %{_bindir}/Magick-config %{_bindir}/Wand-config %{_libdir}/libMagick.a -%{_libdir}/libMagick.la %{_libdir}/libMagick.so %{_libdir}/libWand.a -%{_libdir}/libWand.la %{_libdir}/libWand.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/ImageMagick.pc +%{_libdir}/pkgconfig/Wand.pc %{_includedir}/magick %{_includedir}/wand +%{_mandir}/man1/Magick-config.* +%{_mandir}/man1/Wand-config.* %files c++ %defattr(-,root,root) @@ -243,15 +222,25 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/Magick++ %{_includedir}/Magick++.h %{_libdir}/libMagick++.a -%{_libdir}/libMagick++.la %{_libdir}/libMagick++.so +%{_libdir}/pkgconfig/ImageMagick++.pc +%{_mandir}/man1/Magick++-config.* %files perl -f perl-pkg-files %defattr(-,root,root) -#%{_libdir}/perl*/site_perl/*/*/auto/Image -#%{_libdir}/perl*/site_perl/*/*/Image +%{_mandir}/man3/* +%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Apr 25 2005 - 6.2.1.7-1 +- Update to 6.2.1 +- Include multiple improvements and bugfixes + by Rex Dieter et al (111961, 145466, 151196, 149970, + 146518, 113951, 145449, 144977, 144570, 139298) + +* Sun Apr 24 2005 - 6.2.0.7-3 +- Make zip compression work for tiff (#154045) + * Wed Mar 16 2005 - 6.2.0.7-2 - Update to 6.2.0 to fix a number of security issues: #145112 (CAN-2005-05), #151265 (CAN-2005-0397) diff --git a/sources b/sources index 12be960..70e7f82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d051b66a3492df599719dce0e1278cb8 ImageMagick-6.2.0-7.tar.gz +307194aa62c175e1f5dec722f1cbc5e0 ImageMagick-6.2.1-7.tar.bz2