Update to 6.2.4-6
This commit is contained in:
parent
fa1bc00f87
commit
98c6d59385
|
@ -2,3 +2,4 @@ ImageMagick-6.0.7-1.tar.bz2
|
||||||
ImageMagick-6.2.0-7.tar.gz
|
ImageMagick-6.2.0-7.tar.gz
|
||||||
ImageMagick-6.2.1-7.tar.bz2
|
ImageMagick-6.2.1-7.tar.bz2
|
||||||
ImageMagick-6.2.2-0.tar.bz2
|
ImageMagick-6.2.2-0.tar.bz2
|
||||||
|
ImageMagick-6.2.4-6.tar.bz2
|
||||||
|
|
|
@ -1,25 +1,3 @@
|
||||||
--- 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.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
|
+++ ImageMagick-6.1.8/magick/version.h.in 2005-01-18 10:42:27.712406016 -0600
|
||||||
@@ -28,7 +28,7 @@
|
@@ -28,7 +28,7 @@
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# ImageMagick has adopted a new Version.Patchlevel version numbering system...
|
# ImageMagick has adopted a new Version.Patchlevel version numbering system...
|
||||||
# 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
|
# 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
|
||||||
%define VER 6.2.2
|
%define VER 6.2.4
|
||||||
%define Patchlevel 0
|
%define Patchlevel 6
|
||||||
Summary: An X application for displaying and manipulating images.
|
Summary: An X application for displaying and manipulating images.
|
||||||
Name: ImageMagick
|
Name: ImageMagick
|
||||||
%if "%{Patchlevel}" != ""
|
%if "%{Patchlevel}" != ""
|
||||||
|
@ -18,13 +18,7 @@ Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchleve
|
||||||
Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
|
Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
Source1: magick_small.png
|
Source1: magick_small.png
|
||||||
Patch2: ImageMagick-6.2.1-hp2xx.patch
|
|
||||||
Patch3: ImageMagick-6.2.0-compress.patch
|
|
||||||
Patch4: ImageMagick-6.2.1-local_doc.patch
|
Patch4: ImageMagick-6.2.1-local_doc.patch
|
||||||
Patch6: ImageMagick-6.2.1-pkgconfig.patch
|
|
||||||
Patch7: ImageMagick-6.2.1-fixed.patch
|
|
||||||
# 158791
|
|
||||||
Patch8: ImageMagick-5.5.6-mask.patch
|
|
||||||
|
|
||||||
Url: http://www.imagemagick.org/
|
Url: http://www.imagemagick.org/
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
|
@ -57,6 +51,10 @@ Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: XFree86-devel
|
Requires: XFree86-devel
|
||||||
Requires: ghostscript-devel
|
Requires: ghostscript-devel
|
||||||
|
Requires: bzip2-devel
|
||||||
|
Requires: libtiff-devel
|
||||||
|
Requires: libjpeg-devel
|
||||||
|
Requires: pkgconfig
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
ImageMagick-devel contains the static libraries and header files you'll
|
ImageMagick-devel contains the static libraries and header files you'll
|
||||||
|
@ -113,12 +111,7 @@ however.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{VER}
|
%setup -q -n %{name}-%{VER}
|
||||||
%patch2 -p1 -b .hp2xx
|
|
||||||
%patch3 -p1 -b .compress
|
|
||||||
%patch4 -p1 -b .local_doc
|
%patch4 -p1 -b .local_doc
|
||||||
%patch6 -p1 -b .pkgconfig
|
|
||||||
%patch7 -p1 -b .fixed
|
|
||||||
%patch8 -p1 -b .mask
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-shared \
|
%configure --enable-shared \
|
||||||
|
@ -130,7 +123,8 @@ however.
|
||||||
--with-gslib \
|
--with-gslib \
|
||||||
--with-wmf \
|
--with-wmf \
|
||||||
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LD='%__ld -L$PWD/magick/.libs'" \
|
--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
|
--with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
|
||||||
|
--without-dps
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
|
@ -228,6 +222,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 20 2005 Matthias Clasen <mclasen@redhat.com> 6.2.4.6-1
|
||||||
|
- Update to 6.2.4-6
|
||||||
|
- Drop upstreamed patches
|
||||||
|
- Disable DPS (#158984)
|
||||||
|
- Add missing requires (#165931)
|
||||||
|
|
||||||
* Thu Jun 9 2005 Tim Waugh <twaugh@redhat.com> 6.2.2.0-4
|
* Thu Jun 9 2005 Tim Waugh <twaugh@redhat.com> 6.2.2.0-4
|
||||||
- Rebuilt for fixed ghostscript.
|
- Rebuilt for fixed ghostscript.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue