rpms/ImageMagick/devel ImageMagick-6.3.8-multilib.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 ImageMagick.spec, 1.71, 1.72 sources, 1.20, 1.21
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Jan 25 02:30:19 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3375
Modified Files:
.cvsignore ImageMagick.spec sources
Added Files:
ImageMagick-6.3.8-multilib.patch
Log Message:
ImageMagick-6.3.8-multilib.patch:
--- NEW FILE ImageMagick-6.3.8-multilib.patch ---
diff -up ImageMagick-6.3.8/magick/Magick-config.in.BAD ImageMagick-6.3.8/magick/Magick-config.in
--- ImageMagick-6.3.8/magick/Magick-config.in.BAD 2008-01-24 20:02:24.000000000 -0500
+++ ImageMagick-6.3.8/magick/Magick-config.in 2008-01-24 20:03:59.000000000 -0500
@@ -28,31 +28,31 @@ while test $# -gt 0; do
prefix=$optarg
;;
--prefix)
- echo $prefix
+ pkg-config --variable prefix ImageMagick
;;
--exec-prefix=*)
exec_prefix=$optarg
;;
--exec-prefix)
- echo $exec_prefix
+ pkg-config --variable exec_prefix ImageMagick
;;
--version)
- echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ pkg-config --modversion ImageMagick
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags ImageMagick
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags ImageMagick
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags ImageMagick
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs ImageMagick
;;
--libs)
- echo "-L${libdir} -lWand -lMagick"
+ pkg-config --libs ImageMagick
;;
*)
echo "${usage}" 1>&2
diff -up ImageMagick-6.3.8/wand/Wand-config.in.BAD ImageMagick-6.3.8/wand/Wand-config.in
--- ImageMagick-6.3.8/wand/Wand-config.in.BAD 2008-01-24 20:04:08.000000000 -0500
+++ ImageMagick-6.3.8/wand/Wand-config.in 2008-01-24 20:05:35.000000000 -0500
@@ -28,31 +28,31 @@ while test $# -gt 0; do
prefix=$optarg
;;
--prefix)
- echo $prefix
+ pkg-config --variable prefix Wand
;;
--exec-prefix=*)
exec_prefix=$optarg
;;
--exec-prefix)
- echo $exec_prefix
+ pkg-config --variable exec_prefix Wand
;;
--version)
- echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ pkg-config --modversion Wand
;;
--cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
+ pkg-config --cflags Wand
;;
--cxxflags)
- echo '@MAGICK_CXXFLAGS@'
+ pkg-config --cflags Wand
;;
--cppflags)
- echo '@MAGICK_CPPFLAGS@'
+ pkg-config --cflags Wand
;;
--ldflags)
- echo '@MAGICK_LDFLAGS@'
+ pkg-config --libs Wand
;;
--libs)
- echo "-L${libdir} -lWand -lMagick"
+ pkg-config --libs Wand
;;
*)
echo "${usage}" 1>&2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Sep 2007 03:12:17 -0000 1.20
+++ .cvsignore 25 Jan 2008 02:29:46 -0000 1.21
@@ -1 +1 @@
-ImageMagick-6.3.5-9.tar.bz2
+ImageMagick-6.3.8-1.tar.bz2
Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ImageMagick.spec 21 Sep 2007 03:12:17 -0000 1.71
+++ ImageMagick.spec 25 Jan 2008 02:29:46 -0000 1.72
@@ -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 6.3.5
-%define Patchlevel 9
+%define VER 6.3.8
+%define Patchlevel 1
Summary: An X application for displaying and manipulating images.
Name: ImageMagick
%if "%{Patchlevel}" != ""
@@ -10,7 +10,7 @@
Version: %{VER}
%endif
Release: 1%{?dist}
-License: freeware
+License: ImageMagick
Group: Applications/Multimedia
%if "%{Patchlevel}" != ""
Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2
@@ -18,7 +18,7 @@
Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
%endif
Source1: magick_small.png
-Patch1: ImageMagick-6.3.5-multilib.patch
+Patch1: ImageMagick-6.3.8-multilib.patch
Patch2: ImageMagick-6.3.5-open.patch
@@ -30,7 +30,7 @@
BuildRequires: freetype-devel >= 2.1
BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
BuildRequires: ghostscript-devel
-BuildRequires: perl-devel
+BuildRequires: perl-devel, perl(ExtUtils::MakeMaker)
BuildRequires: libwmf-devel, jasper-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
@@ -120,7 +120,8 @@
%prep
%setup -q -n %{name}-%{VER}
%patch1 -p1 -b .multilib
-%patch2 -p1 -b .open_args
+# No longer needed.
+# %patch2 -p1 -b .open_args
%build
%configure --enable-shared \
@@ -137,6 +138,9 @@
--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
+# 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
@@ -173,7 +177,7 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
# fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64 alpha
+%ifarch x86_64 s390x ia64 ppc64 alpha sparc64
%define wordsize 64
%else
%define wordsize 32
@@ -256,6 +260,13 @@
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
+* Thu Jan 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 6.3.8.1-1
+- update to 6.3.8.1
+- rebuild for new perl
+- fix license tag
+- fix rpath issues
+- add sparc64 to 64bit arch list
+
* Fri Sep 21 2007 Norm Murray <nmurray at redhat.com> 6.3.5.9-1.fc8
- rebase to 6.3.5.9
- fix build with missing open() arg
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Sep 2007 03:12:17 -0000 1.20
+++ sources 25 Jan 2008 02:29:46 -0000 1.21
@@ -1 +1 @@
-d636d2113fbfe7453088bda31aa5ccbc ImageMagick-6.3.5-9.tar.bz2
+bda5a04205662182de2d2b33449491d4 ImageMagick-6.3.8-1.tar.bz2
More information about the fedora-extras-commits
mailing list