rpms/ImageMagick/devel ImageMagick-6.3.8-invalid-gerror-use.patch, NONE, 1.1 ImageMagick-6.4.0-multilib.patch, NONE, 1.1 ImageMagick-6.4.0-xdg-open.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 ImageMagick.spec, 1.74, 1.75 sources, 1.21, 1.22 ImageMagick-5.3.6-nonroot.patch, 1.1, NONE ImageMagick-5.3.7-config.patch, 1.1, NONE ImageMagick-5.4.7-localdoc.patch, 1.3, NONE ImageMagick-5.5.6-mask.patch, 1.1, NONE ImageMagick-5.5.7-automake.patch, 1.1, NONE ImageMagick-5.5.7-stdin.patch, 1.1, NONE ImageMagick-6.0.6-hp2xx.patch, 1.1, NONE ImageMagick-6.0.7-vsnprintf.patch, 1.1, NONE ImageMagick-6.2.0-compress.patch, 1.1, NONE ImageMagick-6.2.0-hp2xx.patch, 1.1, NONE ImageMagick-6.2.0-lprhack.patch, 1.1, NONE ImageMagick-6.2.0-vsnprintf.patch, 1.1, NONE ImageMagick-6.2.1-fixed.patch, 1.1, NONE ImageMagick-6.2.1-gslib.patch, 1.1, NONE ImageMagick-6.2.1-hp2xx.patch, 1.1, NONE ImageMagick-6.2.1-local_doc.patch, 1.2, NONE ImageMagick-6.2.1-pkgconfig.patch, 1.1, NONE ImageMagick-6.2.5-format-string-again.patch, 1.2, NONE ImageMagick-6.2.5-multilib.patch, 1.1, NONE ImageMagick-6.2.5-yet-another-overflow.patch, 1.1, NONE ImageMagick-6.2.8-CVE-2007-1797.patch, 1.1, NONE ImageMagick-6.2.8-cve-2006-3743.patch, 1.1, NONE ImageMagick-6.2.8-cve-2006-4144.patch, 1.1, NONE ImageMagick-6.2.8-multilib.patch, 1.1, NONE ImageMagick-6.3.2-perl-liblink.patch, 1.1, NONE ImageMagick-6.3.2-perl-parallel-build.patch, 1.1, NONE ImageMagick-6.3.5-multilib.patch, 1.1, NONE ImageMagick-6.3.5-open.patch, 1.1, NONE ImageMagick-6.3.8-multilib.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Apr 27 19:41:22 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/ImageMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26090
Modified Files:
.cvsignore ImageMagick.spec sources
Added Files:
ImageMagick-6.3.8-invalid-gerror-use.patch
ImageMagick-6.4.0-multilib.patch
ImageMagick-6.4.0-xdg-open.patch
Removed Files:
ImageMagick-5.3.6-nonroot.patch ImageMagick-5.3.7-config.patch
ImageMagick-5.4.7-localdoc.patch ImageMagick-5.5.6-mask.patch
ImageMagick-5.5.7-automake.patch ImageMagick-5.5.7-stdin.patch
ImageMagick-6.0.6-hp2xx.patch
ImageMagick-6.0.7-vsnprintf.patch
ImageMagick-6.2.0-compress.patch ImageMagick-6.2.0-hp2xx.patch
ImageMagick-6.2.0-lprhack.patch
ImageMagick-6.2.0-vsnprintf.patch
ImageMagick-6.2.1-fixed.patch ImageMagick-6.2.1-gslib.patch
ImageMagick-6.2.1-hp2xx.patch
ImageMagick-6.2.1-local_doc.patch
ImageMagick-6.2.1-pkgconfig.patch
ImageMagick-6.2.5-format-string-again.patch
ImageMagick-6.2.5-multilib.patch
ImageMagick-6.2.5-yet-another-overflow.patch
ImageMagick-6.2.8-CVE-2007-1797.patch
ImageMagick-6.2.8-cve-2006-3743.patch
ImageMagick-6.2.8-cve-2006-4144.patch
ImageMagick-6.2.8-multilib.patch
ImageMagick-6.3.2-perl-liblink.patch
ImageMagick-6.3.2-perl-parallel-build.patch
ImageMagick-6.3.5-multilib.patch ImageMagick-6.3.5-open.patch
ImageMagick-6.3.8-multilib.patch
Log Message:
* Sat Apr 26 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 6.4.0.10-1
- New upstream release 6.4.0.10
- This fixes conversion of 24 bpp windows icons (bz 440136)
- Don't reuse GError structs, that upsets glib2 (bz 325211)
- Use the system ltdl, not the included copy (bz 237475)
- Fix various multilib conflicts (bz 341561)
- Use xdg-open instead of htmlview (bz 388451)
- Some small specfile cleanups (utf-8 stuff & others) fixing rpmlint warnings
ImageMagick-6.3.8-invalid-gerror-use.patch:
--- NEW FILE ImageMagick-6.3.8-invalid-gerror-use.patch ---
diff -up ImageMagick-6.4.0/coders/svg.c~ ImageMagick-6.4.0/coders/svg.c
--- ImageMagick-6.4.0/coders/svg.c~ 2008-04-26 11:32:26.000000000 +0200
+++ ImageMagick-6.4.0/coders/svg.c 2008-04-26 11:32:26.000000000 +0200
@@ -2777,12 +2777,20 @@ static Image *ReadSVGImage(const ImageIn
rsvg_handle_set_dpi_x_y(svg_info,
image->x_resolution == 0.0 ? 72.0 : image->x_resolution,
image->y_resolution == 0.0 ? 72.0 : image->y_resolution);
- error=(GError *) NULL;
- while ((n=ReadBlob(image,MaxTextExtent,message)) != 0)
+ while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) {
+ error=(GError *) NULL;
(void) rsvg_handle_write(svg_info,message,n,&error);
+ if (error != (GError *) NULL) {
+ /* FIXME actually do something with the error */
+ g_error_free(error);
+ }
+ }
+ error=(GError *) NULL;
rsvg_handle_close(svg_info,&error);
- if (error != (GError *) NULL)
+ if (error != (GError *) NULL) {
+ /* FIXME actually do something with the error */
g_error_free(error);
+ }
#if defined(MAGICKCORE_CAIRO_DELEGATE)
rsvg_handle_get_dimensions(svg_info,&dimension_info);
image->columns=dimension_info.width*image->x_resolution/72.0;
ImageMagick-6.4.0-multilib.patch:
--- NEW FILE ImageMagick-6.4.0-multilib.patch ---
diff -up ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in
--- ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ 2008-04-27 16:25:14.000000000 +0200
+++ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in 2008-04-27 16:25:14.000000000 +0200
@@ -7,8 +7,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]
@@ -43,19 +41,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags Magick++
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags Magick++
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags Magick++
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs Magick++
;;
--libs)
- echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore"
+ pkg-config --libs Magick++
;;
*)
echo "${usage}" 1>&2
diff -up ImageMagick-6.4.0/magick/Magick-config.in~ ImageMagick-6.4.0/magick/Magick-config.in
--- ImageMagick-6.4.0/magick/Magick-config.in~ 2008-04-27 16:25:15.000000000 +0200
+++ ImageMagick-6.4.0/magick/Magick-config.in 2008-04-27 16:25:15.000000000 +0200
@@ -6,8 +6,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
usage="\
Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags MagickCore
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags MagickCore
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags MagickCore
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs MagickCore
;;
--libs)
- echo "-L${libdir} -lMagickWand -lMagickCore"
+ pkg-config --libs MagickCore
;;
*)
echo "${usage}" 1>&2
diff -up ImageMagick-6.4.0/magick/MagickCore-config.in~ ImageMagick-6.4.0/magick/MagickCore-config.in
--- ImageMagick-6.4.0/magick/MagickCore-config.in~ 2008-04-27 16:25:14.000000000 +0200
+++ ImageMagick-6.4.0/magick/MagickCore-config.in 2008-04-27 16:25:14.000000000 +0200
@@ -6,8 +6,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
usage="\
Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags MagickCore
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags MagickCore
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags MagickCore
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs MagickCore
;;
--libs)
- echo "-L${libdir} -lMagickWand -lMagickCore"
+ pkg-config --libs MagickCore
;;
*)
echo "${usage}" 1>&2
diff -up ImageMagick-6.4.0/wand/MagickWand-config.in~ ImageMagick-6.4.0/wand/MagickWand-config.in
--- ImageMagick-6.4.0/wand/MagickWand-config.in~ 2008-04-27 16:25:15.000000000 +0200
+++ ImageMagick-6.4.0/wand/MagickWand-config.in 2008-04-27 16:25:15.000000000 +0200
@@ -6,8 +6,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
usage="\
Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags MagickWand
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags MagickWand
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags MagickWand
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs MagickWand
;;
--libs)
- echo "-L${libdir} -lMagickWand -lMagickCore"
+ pkg-config --libs MagickWand
;;
*)
echo "${usage}" 1>&2
diff -up ImageMagick-6.4.0/wand/Wand-config.in~ ImageMagick-6.4.0/wand/Wand-config.in
--- ImageMagick-6.4.0/wand/Wand-config.in~ 2008-04-27 16:25:15.000000000 +0200
+++ ImageMagick-6.4.0/wand/Wand-config.in 2008-04-27 16:25:15.000000000 +0200
@@ -6,8 +6,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
usage="\
Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
@@ -40,19 +38,19 @@ while test $# -gt 0; do
echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags MagickWand
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags MagickWand
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags MagickWand
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs MagickWand
;;
--libs)
- echo "-L${libdir} -lMagickWand -lMagickCore"
+ pkg-config --libs MagickWand
;;
*)
echo "${usage}" 1>&2
ImageMagick-6.4.0-xdg-open.patch:
--- NEW FILE ImageMagick-6.4.0-xdg-open.patch ---
diff -up ImageMagick-6.4.0/configure.ac.orig ImageMagick-6.4.0/configure.ac
--- ImageMagick-6.4.0/configure.ac.orig 2008-04-22 05:38:56.000000000 +0200
+++ ImageMagick-6.4.0/configure.ac 2008-04-27 16:33:28.000000000 +0200
@@ -2391,7 +2391,7 @@ AC_MSG_RESULT([-------------------------
AutotraceDecodeDelegateDefault='autotrace'
AVIDecodeDelegateDefault='mplayer'
BZIPDelegateDefault='bzip2'
-BrowseDelegateDefault='htmlview'
+BrowseDelegateDefault='xdg-open'
CGMDecodeDelegateDefault='ralcgm'
CatDelegateDefault='cat'
DNGDecodeDelegateDefault='ufraw-batch'
diff -up ImageMagick-6.4.0/magick/delegate.c.orig ImageMagick-6.4.0/magick/delegate.c
--- ImageMagick-6.4.0/magick/delegate.c.orig 2008-04-06 03:39:42.000000000 +0200
+++ ImageMagick-6.4.0/magick/delegate.c 2008-04-27 16:35:46.000000000 +0200
@@ -78,7 +78,7 @@ static const char
"<delegatemap>"
" <delegate decode=\"autotrace\" stealth=\"True\" command=\""autotrace" -output-format svg -output-file "%o" "%i"\"/>"
" <delegate decode=\"avi:decode\" stealth=\"True\" command=\""mplayer" "%i" -really-quiet -ao null -vo png:z=3\"/>"
- " <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\""htmlview" http://www.imagemagick.org/\"/>"
+ " <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\""xdg-open" http://www.imagemagick.org/\"/>"
" <delegate decode=\"cgm\" thread-support=\"False\" command=\""ralcgm" -d ps -oC < "%i" > "%o" >>/dev/null\"/>"
" <delegate decode=\"dng:decode\" command=\""/usr/bin/ufraw-batch" --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 "--output=%u.pnm" "%i"\"/>"
" <delegate decode=\"edit\" stealth=\"True\" command=\""xterm" -title "Edit Image Comment" -e vi "%o"\"/>"
diff -up ImageMagick-6.4.0/www/source/delegates.xml.orig ImageMagick-6.4.0/www/source/delegates.xml
--- ImageMagick-6.4.0/www/source/delegates.xml.orig 2008-04-04 18:43:27.000000000 +0200
+++ ImageMagick-6.4.0/www/source/delegates.xml 2008-04-27 16:35:06.000000000 +0200
@@ -57,7 +57,7 @@
-->
<delegatemap>
<delegate decode="autotrace" stealth="True" command=""autotrace" -output-format svg -output-file "%o" "%i""/>
- <delegate decode="browse" stealth="True" spawn="True" command=""htmlview" http://www.imagemagick.org/"/>
+ <delegate decode="browse" stealth="True" spawn="True" command=""xdg-open" http://www.imagemagick.org/"/>
<delegate decode="cgm" thread-support="False" command=""ralcgm" -d ps -oC < "%i" > "%o" 2> "%u""/>
<delegate decode="dng:decode" command=""ufraw-batch" --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 "--output=%u.pnm" "%i""/>
<delegate decode="edit" stealth="True" command=""xterm" -title "Edit Image Comment" -e vi "%o""/>
diff -up ImageMagick-6.4.0/configure.orig ImageMagick-6.4.0/configure
--- ImageMagick-6.4.0/configure.orig 2008-04-24 17:07:05.000000000 +0200
+++ ImageMagick-6.4.0/configure 2008-04-27 16:33:28.000000000 +0200
@@ -40762,7 +40762,7 @@ $as_echo "------------------------------
AutotraceDecodeDelegateDefault='autotrace'
AVIDecodeDelegateDefault='mplayer'
BZIPDelegateDefault='bzip2'
-BrowseDelegateDefault='htmlview'
+BrowseDelegateDefault='xdg-open'
CGMDecodeDelegateDefault='ralcgm'
CatDelegateDefault='cat'
DNGDecodeDelegateDefault='ufraw-batch'
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 25 Jan 2008 02:29:46 -0000 1.21
+++ .cvsignore 27 Apr 2008 19:40:45 -0000 1.22
@@ -1 +1 @@
-ImageMagick-6.3.8-1.tar.bz2
+ImageMagick-6.4.0-10.tar.bz2
Index: ImageMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ImageMagick.spec 28 Feb 2008 13:13:46 -0000 1.74
+++ ImageMagick.spec 27 Apr 2008 19:40:45 -0000 1.75
@@ -1,15 +1,15 @@
# 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.3.8
-%define Patchlevel 1
-Summary: An X application for displaying and manipulating images.
+%define VER 6.4.0
+%define Patchlevel 10
+Summary: An X application for displaying and manipulating images
Name: ImageMagick
%if "%{Patchlevel}" != ""
Version: %{VER}.%{Patchlevel}
%else
Version: %{VER}
%endif
-Release: 3%{?dist}
+Release: 1%{?dist}
License: ImageMagick
Group: Applications/Multimedia
%if "%{Patchlevel}" != ""
@@ -18,20 +18,19 @@
Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
%endif
Source1: magick_small.png
-Patch1: ImageMagick-6.3.8-multilib.patch
-Patch2: ImageMagick-6.3.5-open.patch
-
-
+Patch1: ImageMagick-6.4.0-multilib.patch
+Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch
+Patch3: ImageMagick-6.4.0-xdg-open.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: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
+BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
BuildRequires: freetype-devel >= 2.1
BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
BuildRequires: ghostscript-devel
BuildRequires: perl-devel, perl(ExtUtils::MakeMaker)
-BuildRequires: libwmf-devel, jasper-devel
+BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
@@ -51,7 +50,7 @@
ImageMagick-devel as well.
%package devel
-Summary: Static libraries and header files for ImageMagick app development.
+Summary: Library links and header files for ImageMagick app development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libX11-devel, libXext-devel, libXt-devel
@@ -61,11 +60,11 @@
Requires: libtiff-devel
Requires: libjpeg-devel
Requires: lcms-devel
+Requires: jasper-devel
Requires: pkgconfig
-Requires: jasper
%description devel
-ImageMagick-devel contains the static libraries and header files you'll
+ImageMagick-devel contains the library links and header files you'll
need to develop ImageMagick applications. ImageMagick is an image
manipulation program.
@@ -78,9 +77,7 @@
Summary: ImageMagick perl bindings
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: perl >= 5.6.0
-%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
-Prereq: %{perl_vendorarch}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description perl
Perl bindings to ImageMagick.
@@ -117,37 +114,46 @@
want to develop/compile applications using the ImageMagick C interface,
however.
+
%prep
%setup -q -n %{name}-%{VER}
%patch1 -p1 -b .multilib
-# No longer needed.
-# %patch2 -p1 -b .open_args
+%patch2 -p1
+%patch3 -p1
+iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp
+touch -r README.txt README.txt.tmp
+mv README.txt.tmp README.txt
+
%build
%configure --enable-shared \
--with-modules \
--with-perl \
- --with-x \
+ --with-x \
--with-threads \
--with-magick_plus_plus \
- --with-gslib \
+ --with-gslib \
--with-wmf \
--with-lcms \
--with-rsvg \
- --with-xml \
+ --with-xml \
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
--without-windows-font-dir \
- --without-dps
+ --without-dps \
+ --without-included-ltdl --with-ltdl-include=%{_includedir} \
+ --with-ltdl-lib=%{_libdir}
# Disable rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
make
+
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+# fix weird perl Magick.so permissions
+chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so
# perlmagick: fix perl path of demo files
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
@@ -159,11 +165,11 @@
# perlmagick: build files list
echo "%defattr(-,root,root)" > perl-pkg-files
find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \
- | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files
+ | 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
+ | 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
@@ -183,12 +189,12 @@
%define wordsize 32
%endif
-mv $RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h \
- $RPM_BUILD_ROOT%{_includedir}/magick/magick-config-%{wordsize}.h
+mv $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h \
+ $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config-%{wordsize}.h
-cat >$RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h <<EOF
-#ifndef ORBIT_MULTILIB
-#define ORBIT_MULTILIB
+cat >$RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h <<EOF
+#ifndef IMAGEMAGICK_MULTILIB
+#define IMAGEMAGICK_MULTILIB
#include <bits/wordsize.h>
@@ -207,6 +213,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
%post -p /sbin/ldconfig
%post c++ -p /sbin/ldconfig
@@ -215,12 +222,13 @@
%postun c++ -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
%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.*
+%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
+%attr(755,root,root) %{_libdir}/libMagickCore.so.*
+%attr(755,root,root) %{_libdir}/libMagickWand.so.*
%{_bindir}/[a-z]*
%{_libdir}/ImageMagick*
%{_datadir}/ImageMagick*
@@ -230,16 +238,22 @@
%files devel
%defattr(-,root,root)
+%{_bindir}/MagickCore-config
%{_bindir}/Magick-config
+%{_bindir}/MagickWand-config
%{_bindir}/Wand-config
-%{_libdir}/libMagick.so
-%{_libdir}/libWand.so
+%{_libdir}/libMagickCore.so
+%{_libdir}/libMagickWand.so
+%{_libdir}/pkgconfig/MagickCore.pc
%{_libdir}/pkgconfig/ImageMagick.pc
+%{_libdir}/pkgconfig/MagickWand.pc
%{_libdir}/pkgconfig/Wand.pc
-%{_includedir}/magick
-%{_includedir}/wand
+%{_includedir}/ImageMagick/magick
+%{_includedir}/ImageMagick/wand
%{_mandir}/man1/Magick-config.*
+%{_mandir}/man1/MagickCore-config.*
%{_mandir}/man1/Wand-config.*
+%{_mandir}/man1/MagickWand-config.*
%files c++
%defattr(-,root,root)
@@ -248,9 +262,10 @@
%files c++-devel
%defattr(-,root,root)
%{_bindir}/Magick++-config
-%{_includedir}/Magick++
-%{_includedir}/Magick++.h
+%{_includedir}/ImageMagick/Magick++
+%{_includedir}/ImageMagick/Magick++.h
%{_libdir}/libMagick++.so
+%{_libdir}/pkgconfig/Magick++.pc
%{_libdir}/pkgconfig/ImageMagick++.pc
%{_mandir}/man1/Magick++-config.*
@@ -259,7 +274,17 @@
%{_mandir}/man3/*
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
+
%changelog
+* Sat Apr 26 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 6.4.0.10-1
+- New upstream release 6.4.0.10
+- This fixes conversion of 24 bpp windows icons (bz 440136)
+- Don't reuse GError structs, that upsets glib2 (bz 325211)
+- Use the system ltdl, not the included copy (bz 237475)
+- Fix various multilib conflicts (bz 341561)
+- Use xdg-open instead of htmlview (bz 388451)
+- Some small specfile cleanups (utf-8 stuff & others) fixing rpmlint warnings
+
* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.8.1-3
- Rebuild for perl 5.10 (again)
@@ -433,7 +458,7 @@
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
-* Thu May 29 2003 Tim Powers <timp at redhat.com> %{nil}-4
+* Thu May 29 2003 Tim Powers <timp at redhat.com> 5.5.6-4
- rebuild for RHEL to fix broken deps
* Thu May 15 2003 Tim Powers <timp at redhat.com> 5.5.6-3
@@ -540,7 +565,7 @@
* Mon Oct 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.4.0-1
- 5.4.0
- work around build system breakage causing applications to be named
- %{_arch}-redhat-linux-foo rather than foo
+ %%{_arch}-redhat-linux-foo rather than foo
* Wed Sep 19 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.3.9-1
- 5.3.9
@@ -640,7 +665,7 @@
- bootstrap rebuilt to nuke broken libbz2 deps
- add Prefix: tag such that the FHS macros work properly
-* Wed May 17 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed May 17 2000 Trond Eivind Glomsrød <teg at redhat.com>
- now compiles with bzip2 1.0
- changed buildroot to include version
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 25 Jan 2008 02:29:46 -0000 1.21
+++ sources 27 Apr 2008 19:40:45 -0000 1.22
@@ -1 +1 @@
-bda5a04205662182de2d2b33449491d4 ImageMagick-6.3.8-1.tar.bz2
+2c6215e0ac8468356255e9aefbc9fe94 ImageMagick-6.4.0-10.tar.bz2
--- ImageMagick-5.3.6-nonroot.patch DELETED ---
--- ImageMagick-5.3.7-config.patch DELETED ---
--- ImageMagick-5.4.7-localdoc.patch DELETED ---
--- ImageMagick-5.5.6-mask.patch DELETED ---
--- ImageMagick-5.5.7-automake.patch DELETED ---
--- ImageMagick-5.5.7-stdin.patch DELETED ---
--- ImageMagick-6.0.6-hp2xx.patch DELETED ---
--- ImageMagick-6.0.7-vsnprintf.patch DELETED ---
--- ImageMagick-6.2.0-compress.patch DELETED ---
--- ImageMagick-6.2.0-hp2xx.patch DELETED ---
--- ImageMagick-6.2.0-lprhack.patch DELETED ---
--- ImageMagick-6.2.0-vsnprintf.patch DELETED ---
--- ImageMagick-6.2.1-fixed.patch DELETED ---
--- ImageMagick-6.2.1-gslib.patch DELETED ---
--- ImageMagick-6.2.1-hp2xx.patch DELETED ---
--- ImageMagick-6.2.1-local_doc.patch DELETED ---
--- ImageMagick-6.2.1-pkgconfig.patch DELETED ---
--- ImageMagick-6.2.5-format-string-again.patch DELETED ---
--- ImageMagick-6.2.5-multilib.patch DELETED ---
--- ImageMagick-6.2.5-yet-another-overflow.patch DELETED ---
--- ImageMagick-6.2.8-CVE-2007-1797.patch DELETED ---
--- ImageMagick-6.2.8-cve-2006-3743.patch DELETED ---
--- ImageMagick-6.2.8-cve-2006-4144.patch DELETED ---
--- ImageMagick-6.2.8-multilib.patch DELETED ---
--- ImageMagick-6.3.2-perl-liblink.patch DELETED ---
--- ImageMagick-6.3.2-perl-parallel-build.patch DELETED ---
--- ImageMagick-6.3.5-multilib.patch DELETED ---
--- ImageMagick-6.3.5-open.patch DELETED ---
--- ImageMagick-6.3.8-multilib.patch DELETED ---
More information about the fedora-extras-commits
mailing list