From: cristy Date: Mon, 19 Mar 2012 00:37:22 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6018 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72182d8657338f5257c1ee8b1638dc683d0ebcf0;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index df897e62e..fc12d1029 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -165,7 +165,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} @@ -177,29 +177,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} -rm $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} INSTALL="install -p" +cp -a www/source %{buildroot}%{_datadir}/doc/%{name} +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 @@ -214,10 +214,10 @@ fi %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 <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 @@ -214,10 +214,10 @@ fi %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 <ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-14 + 2012-03-18 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-03-14 + 2012-03-18 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 401ded14d..ea82c07f4 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 0572cd355..b7302d43f 100755 --- a/configure +++ b/configure @@ -3616,7 +3616,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=7108 +MAGICK_SVN_REVISION=7154