rpms/ImageMagick/F-9 ImageMagick-6.4.0-multilib.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 ImageMagick.spec, 1.74, 1.75 sources, 1.21, 1.22
Norman Murray (nmurray)
fedora-extras-commits at redhat.com
Tue Apr 22 23:57:53 UTC 2008
Author: nmurray
Update of /cvs/pkgs/rpms/ImageMagick/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4358
Modified Files:
.cvsignore ImageMagick.spec sources
Added Files:
ImageMagick-6.4.0-multilib.patch
Log Message:
Rebase to resolve BZ440136 and others.
ImageMagick-6.4.0-multilib.patch:
--- NEW FILE ImageMagick-6.4.0-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} -lMagickWand -lMagickCore"
+ 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} -lMagickWand -lMagickCore"
+ pkg-config --libs Wand
;;
*)
echo "${usage}" 1>&2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-9/.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 22 Apr 2008 23:57:17 -0000 1.22
@@ -1 +1,2 @@
ImageMagick-6.3.8-1.tar.bz2
+ImageMagick-6.4.0-7.tar.bz2
Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-9/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 22 Apr 2008 23:57:17 -0000 1.75
@@ -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.8
-%define Patchlevel 1
+%define VER 6.4.0
+%define Patchlevel 7
Summary: An X application for displaying and manipulating images.
Name: ImageMagick
%if "%{Patchlevel}" != ""
@@ -9,7 +9,7 @@
%else
Version: %{VER}
%endif
-Release: 3%{?dist}
+Release: 1%{?dist}
License: ImageMagick
Group: Applications/Multimedia
%if "%{Patchlevel}" != ""
@@ -18,8 +18,8 @@
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
+
@@ -120,8 +120,7 @@
%prep
%setup -q -n %{name}-%{VER}
%patch1 -p1 -b .multilib
-# No longer needed.
-# %patch2 -p1 -b .open_args
+
%build
%configure --enable-shared \
@@ -183,10 +182,10 @@
%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
+cat >$RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h <<EOF
#ifndef ORBIT_MULTILIB
#define ORBIT_MULTILIB
@@ -218,9 +217,9 @@
%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 +229,21 @@
%files devel
%defattr(-,root,root)
+%{_bindir}/MagickCore-config
+%{_bindir}/MagickWand-config
%{_bindir}/Magick-config
%{_bindir}/Wand-config
-%{_libdir}/libMagick.so
-%{_libdir}/libWand.so
+%{_libdir}/libMagickCore.so
+%{_libdir}/libMagickWand.so
%{_libdir}/pkgconfig/ImageMagick.pc
+%{_libdir}/pkgconfig/MagickCore.pc
+%{_libdir}/pkgconfig/MagickWand.pc
%{_libdir}/pkgconfig/Wand.pc
-%{_includedir}/magick
-%{_includedir}/wand
+%{_includedir}/ImageMagick
%{_mandir}/man1/Magick-config.*
%{_mandir}/man1/Wand-config.*
+%{_mandir}/man1/MagickCore-config.*
+%{_mandir}/man1/MagickWand-config.*
%files c++
%defattr(-,root,root)
@@ -248,10 +252,11 @@
%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/ImageMagick++.pc
+%{_libdir}/pkgconfig/Magick++.pc
%{_mandir}/man1/Magick++-config.*
%files perl -f perl-pkg-files
@@ -260,6 +265,9 @@
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
+* Tue Apr 22 2008 Norm Murray <nmurray at redhat.com> 6.4.0.7-1
+- update to 6.4.0.7
+
* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.8.1-3
- Rebuild for perl 5.10 (again)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/F-9/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 22 Apr 2008 23:57:17 -0000 1.22
@@ -1 +1,2 @@
bda5a04205662182de2d2b33449491d4 ImageMagick-6.3.8-1.tar.bz2
+a36b9076c0d4f880daca10c7ab3f5208 ImageMagick-6.4.0-7.tar.bz2
More information about the fedora-extras-commits
mailing list