(no commit message)

[imagemagick] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 70b525c8b1ef30ea7ed7777030f06be552a84816..c7920c8f3b4971f3e631b76848288fd2e041b28e 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,4 +1,4 @@
-%global VERSION  6.6.8
+%global VERSION  7.0.0
 %global Patchlevel  0
 
 Name:           ImageMagick
@@ -8,7 +8,7 @@ Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a
 Group:          Applications/Multimedia
 License:        http://www.imagemagick.org/script/license.php
 Url:            http://www.imagemagick.org/
-Source0:        ftp://ftp.imagemagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz
+Source0:        ftp://ftp.imagemagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -208,9 +208,6 @@ if [ -z perl-pkg-files ] ; then
     exit -1
 fi
 
-# These don't belong here, we include them in %%doc
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VERSION}/{ChangeLog,LICENSE,NEWS.txt}
-
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 alpha sparc64
 %define wordsize 64
@@ -258,11 +255,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMagickCore.so.4*
 %{_libdir}/libMagickWand.so.4*
 %{_bindir}/[a-z]*
+%{_sysconfdir}/%{name}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-z]*
+%{_mandir}/man[145]/[a-zA-Z]*
 %{_mandir}/man1/%{name}.*
-%exclude %{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.*
+%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
 
 
 %files devel
@@ -287,7 +285,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files djvu
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.*
+%{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.*
 
 %files doc
 %defattr(-,root,root,-)