Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	ImageMagick.spec
@@ -1,38 +1,35 @@ -# 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 -Summary: An X application for displaying and manipulating images. -Name: ImageMagick -%if "%{Patchlevel}" != "" -Version: %{VER}.%{Patchlevel} +%define _pversion 6.3.5 +%define _plevel 9 +Summary: An X application for displaying and manipulating images. +Name: ImageMagick +%if %{?_plevel} +Version: %{_pversion}.%{_plevel} %else -Version: %{VER} +Version: %{_pversion} %endif -Release: 1 -License: freeware -Group: Applications/Multimedia -%if "%{Patchlevel}" != "" -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 +Release: 1 +License: freeware +Group: Applications/Multimedia +%if %{?_plevel} +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{_pversion}-%{_plevel}.tar.bz2 %else -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 %endif -Source1: magick_small.png -Patch1: ImageMagick-6.3.5-multilib.patch -Patch2: ImageMagick-6.3.5-open.patch - - +Source1: magick_small.png +Patch1: ImageMagick-6.3.5-multilib.patch +Patch2: ImageMagick-6.3.5-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: freetype-devel >= 2.1 -BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 -BuildRequires: ghostscript-devel -BuildRequires: libwmf-devel -BuildRequires: libX11-devel, libXext-devel, libXt-devel -BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel + +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.1 +BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 +BuildRequires: ghostscript-devel +BuildRequires: libwmf-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel %description ImageMagick(TM) is an image display and manipulation tool for the X @@ -52,16 +49,15 @@ %package devel Summary: Static libraries and header files for ImageMagick app development. Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libX11-devel, libXext-devel, libXt-devel -Requires: ghostscript-devel -Requires: bzip2-devel -Requires: freetype-devel -Requires: libtiff-devel -Requires: libjpeg-devel -Requires: lcms-devel -Requires: pkgconfig -Requires: jasper +Requires: %{name} = %{version}-%{release} +Requires: libX11-devel, libXext-devel, libXt-devel +Requires: ghostscript-devel +Requires: bzip2-devel +Requires: freetype-devel +Requires: libtiff-devel +Requires: libjpeg-devel +Requires: lcms-devel +Requires: pkgconfig %description devel ImageMagick-devel contains the static libraries and header files you'll @@ -117,7 +113,7 @@ however. %prep -%setup -q -n %{name}-%{VER} +%setup -q -n %{name}-%{_pversion} %patch1 -p1 -b .multilib %patch2 -p1 -b .open_args @@ -166,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick # Keep config -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/[a-b,d-z,A-Z]* +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{_pversion}/[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}/.{a,la} @@ -370,7 +366,7 @@ - move .mgk files (#132007, #131708, #132397) * Sun Sep 12 2004 Karsten Hopp <karsten@redhat.de> 6.0.7.1-1 -- update to 6.0.7 Patchlevel 1, fixes #132106 +- update to 6.0.7 _plevel 1, fixes #132106 * Sat Sep 4 2004 Bill Nottingham <notting@redhat.com> 6.0.6.2-2 - move libWand out of -devel, fix requirements (#131767) @@ -497,7 +493,7 @@ - Update to 5.4.3 pl5; this fixes #58080 * Thu Jan 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 5.4.2.3-1 -- Patchlevel 3 +- _plevel 3 * Wed Jan 09 2002 Tim Powers <timp@redhat.com> - automated rebuild