packages: ImageMagick/ImageMagick.spec - up to 6.6.6-7 - use rm macros - ad...

[lisu]

Author: lisu                         Date: Mon Dec 27 12:43:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 6.6.6-7
- use rm macros
- adapterized

---- Files affected:
packages/ImageMagick:
   ImageMagick.spec (1.375 -> 1.376) 

---- Diffs:

================================================================
Index: packages/ImageMagick/ImageMagick.spec
diff -u packages/ImageMagick/ImageMagick.spec:1.375 packages/ImageMagick/ImageMagick.spec:1.376
--- packages/ImageMagick/ImageMagick.spec:1.375	Wed Dec  8 14:33:31 2010
+++ packages/ImageMagick/ImageMagick.spec	Mon Dec 27 13:43:00 2010
@@ -14,8 +14,8 @@
 %bcond_without	exr		# without OpenEXR module
 
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.6.5
-%define		pver	2
+%define		ver 6.6.6
+%define		pver	7
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -28,12 +28,12 @@
 Summary(uk.UTF-8):	Перегляд, конвертування та обробка зображень під X Window
 Name:		ImageMagick
 Version:	%{ver}%{?pver:.%{pver}}
-Release:	2
+Release:	1
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5:	aae2a0757b9e486f1db0c813fdd6fb3a
+# Source0-md5:	894a9a5b0656430fc0c21b50b4349669
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
@@ -49,11 +49,11 @@
 BuildRequires:	fftw3-devel >= 3.0
 BuildRequires:	fontconfig-devel >= 2.1.0
 BuildRequires:	freetype-devel >= 2.0.2-2
+%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
 %{?with_gs:BuildRequires:	ghostscript-devel}
 %{?with_graphviz:BuildRequires:	graphviz-devel >= 2.9.0}
 %{?with_jasper:BuildRequires:	jasper-devel >= 1.700.5}
 BuildRequires:	jbigkit-devel
-%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
 BuildRequires:	lcms2-devel >= 2.0
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
 %{?with_gomp:BuildRequires:	libgomp-devel}
@@ -655,8 +655,8 @@
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 
 # for koffice 1.6
 cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
@@ -1084,6 +1084,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.376  2010/12/27 12:43:00  lisu
+- up to 6.6.6-7
+- use rm macros
+- adapterized
+
 Revision 1.375  2010/12/08 13:33:31  lisu
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick.spec?r1=1.375&r2=1.376&f=u