X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=ImageMagick.spec.in;h=b4b7672e6284ed02abc0b1aba69b672c330fc82b;hb=d94cea5e41ca84f2582c7bf80c2d1fc32f2f1e04;hp=c7bd9033e0f1aed4f39a52a9c29deb69fdac10a6;hpb=c998d053f08c1ef8b1bfdec2563b651dbf05f24e;p=imagemagick diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index c7bd9033e..b4b7672e6 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -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.bz2 +Source0: http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -73,12 +73,6 @@ APIs, you need to install ImageMagick-devel as well as ImageMagick. You do not need to install it if you just want to use ImageMagick, however. - -%package doc -Summary: ImageMagick HTML documentation -Group: Documentation - - %package djvu Summary: DjVu plugin for ImageMagick Group: Applications/Multimedia @@ -89,6 +83,10 @@ This packages contains a plugin for ImageMagick which makes it possible to save and load DjvU files from ImageMagick and libMagickCore using applications. +%package doc +Summary: ImageMagick HTML documentation +Group: Documentation + %description doc ImageMagick documentation, this package contains usage (for the commandline tools) and API (for the libraries) documentation in HTML format. @@ -99,7 +97,6 @@ http://www.imagemagick.org/. %package perl Summary: ImageMagick perl bindings Group: System Environment/Libraries -Requires: perl-base Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -166,7 +163,7 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples --with-lcms \ --with-rsvg \ --with-xml \ - --with-perl-options='INSTALLDIRS=vendor' \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --without-dps \ --without-included-ltdl --with-ltdl-include=%{_includedir} \ --with-ltdl-lib=%{_libdir} @@ -178,29 +175,29 @@ make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{VERSION} -rm $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} INSTALL="install -p" +cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} +rm %{buildroot}%{_libdir}/*.la # fix weird perl Magick.so permissions -chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so +chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl # perlmagick: cleanup various perl tempfiles from the build which get installed -find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f -find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f -find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f +find %{buildroot} -name "*.bs" |xargs rm -f +find %{buildroot} -name ".packlist" |xargs rm -f +find %{buildroot} -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root,-)" > perl-pkg-files -find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ - | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files -find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ - | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ +find %{buildroot}/%{_libdir}/perl* -type f -print \ + | sed "s@^%{buildroot}@@g" > perl-pkg-files +find %{buildroot}%{perl_vendorarch} -type d -print \ + | sed "s@^%{buildroot}@%dir @g" \ | grep -v '^%dir %{perl_vendorarch}$' \ | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then @@ -208,9 +205,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 @@ -218,10 +212,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VERSION}/{ChangeLog,LICENSE,NEWS.txt} %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ - $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h +mv %{buildroot}%{_includedir}/%{name}/magick/magick-config.h \ + %{buildroot}%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <%{buildroot}%{_includedir}/%{name}/magick/magick-config.h <$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <