Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2013-04-05 07:45:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick", Maintainer is "pgaj...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2013-03-24 21:58:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2013-04-05 07:45:54.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Mar 29 09:37:28 UTC 2013 - pgaj...@suse.com + +- update to 6.8.4-0: + * dropped ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch, + issue is almost fixed -> new test-signatures.patch, + see followups in + http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22479 + * created rpath.patch + * created dont-build-in-install.patch +- upstream changes + * Do not write zero-length TIFF tags + * Do not split words for caption + * The -blur, -guassian-blur, and -sharpen are now convenience methods + for -morphology convolve. + * etc. see ChangeLog + +------------------------------------------------------------------- Old: ---- ImageMagick-6.8.2-4.tar.bz2 ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch ImageMagick-6.8.2.4-versioned-etc.patch New: ---- ImageMagick-6.8.4-0.tar.bz2 ImageMagick-6.8.4.0-dont-build-in-install.patch ImageMagick-6.8.4.0-rpath.patch ImageMagick-6.8.4.0-test-signatures.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.3H6tgD/_old 2013-04-05 07:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.3H6tgD/_new 2013-04-05 07:46:23.000000000 +0200 @@ -42,14 +42,14 @@ BuildRequires: pango-devel BuildRequires: pkgconfig -%define mfr_version 6.8.2 -%define mfr_revision 4 +%define mfr_version 6.8.4 +%define mfr_revision 0 %define quantum_depth 8 %define source_version %{mfr_version}-%{mfr_revision} +%define libver 1 +%define libspec -6_Q%{quantum_depth} Version: %{mfr_version}.%{mfr_revision} Release: 0 -%define libver 7 -%define libspec -Q%{quantum_depth} Summary: Viewer and Converter for Images License: SUSE-ImageMagick Group: Productivity/Graphics/Other @@ -58,11 +58,16 @@ # To get mtime of file Source1: ImageMagick.changes Source2: baselibs.conf -Patch1: ImageMagick-6.6.8.9-examples.patch -Patch2: ImageMagick-6.6.8.9-doc.patch -Patch3: ImageMagick-6.7.6.1-no-dist-lzip.patch -Patch4: ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch -Patch5: ImageMagick-6.8.2.4-versioned-etc.patch +# suse specific patches +Patch0: ImageMagick-6.6.8.9-examples.patch +Patch1: ImageMagick-6.6.8.9-doc.patch +Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch +Patch3: ImageMagick-6.8.4.0-rpath.patch +# bugs +# http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22479 comment from 2013-03-29 +Patch10: ImageMagick-6.8.4.0-test-signatures.patch +# will ask upstream if needed, or if other solution exists +Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -120,11 +125,12 @@ %prep %setup -n ImageMagick-%{source_version} +%patch0 %patch1 -%patch2 +%patch2 -p1 %patch3 -p1 -%patch4 -p4 -R -%patch5 -p1 +%patch10 -p1 +%patch11 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -133,24 +139,24 @@ CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` # Use mtime of .changes for build time sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh - autoreconf --force --install -v - +automake %configure --with-pic \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ --with-modules \ --with-threads \ - --without-perl \ + --with-perl \ + --with-perl-options="INSTALLDIRS=vendor CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ --with-djvu=yes \ --with-wmf=yes \ --with-quantum-depth=%{quantum_depth} +# don't build together, PerlMagick could be miscompiled when using parallel build[1] +# [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all -cd PerlMagick -perl Makefile.PL -make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" +make %{?_smp_mflags} perl-build %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs @@ -165,10 +171,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ pkgdocdir=%{_defaultdocdir}/%{name}/ -cd PerlMagick -%{__make} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor %perl_process_packlist -cd '../Magick++' +cd 'Magick++' %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';' %{__mv} demo/makefile.2 demo/Makefile @@ -178,10 +182,9 @@ -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' %{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* %{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la -echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand -%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api +%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}*/wand +%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}*/www/api %endif rm -rf %{buildroot}/%{_datadir}/doc/%{name} @@ -202,6 +205,7 @@ %docdir %{_docdir}/%{name} %doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %{_bindir}/[^MW]* +%{_libdir}/ImageMagick*/bin* %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz @@ -210,22 +214,22 @@ %doc LICENSE %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* -%{_libdir}/libMagickCore%{libspec}.so.%{libver}* +%{_libdir}/libMagickCore*.so.%{libver}* %dir %{_libdir}/ImageMagick* %dir %{_libdir}/ImageMagick*/modules* %dir %{_libdir}/ImageMagick*/modules*/* -%{_libdir}/ImageMagick*/config%{libspec} %exclude %{_libdir}/ImageMagick*/modules*/*/wmf.* %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* %{_libdir}/ImageMagick*/modules*/*/*.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/*.la +%{_libdir}/ImageMagick*/config* %files -n libMagickWand%{libspec}-%{libver} %defattr(-,root,root) %doc LICENSE -%{_libdir}/libMagickWand%{libspec}.so.%{libver}* +%{_libdir}/libMagickWand*.so.%{libver}* %files extra %defattr(-,root,root) @@ -241,22 +245,20 @@ %files devel %defattr(-,root,root) %doc LICENSE -%{_libdir}/libMagickCore%{libspec}.so -%{_libdir}/libMagickWand%{libspec}.so -%dir %{_includedir}/ImageMagick -%{_includedir}/ImageMagick/magick -%{_includedir}/ImageMagick/wand -%{_includedir}/ImageMagick/wand.h +%{_libdir}/libMagickCore*.so +%{_libdir}/libMagickWand*.so +%dir %{_includedir}/ImageMagick* +%{_includedir}/ImageMagick*/magick +%{_includedir}/ImageMagick*/wand %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config %{_bindir}/Magick-config %{_bindir}/Wand-config -%{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick%{libspec}.pc -%{_libdir}/pkgconfig/Wand*.pc -%{_libdir}/pkgconfig/MagickCore*.pc %{_libdir}/pkgconfig/MagickWand*.pc +%{_libdir}/pkgconfig/MagickCore*.pc +%{_libdir}/pkgconfig/ImageMagick.pc +%{_libdir}/pkgconfig/ImageMagick-*.pc +%{_libdir}/pkgconfig/*Wand*.pc %doc %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz @@ -265,23 +267,23 @@ %doc LICENSE %doc PerlMagick/README.txt %doc PerlMagick/demo -%doc %{_mandir}/man3/Image::Magick.3pm* +%doc %{_mandir}/man3/* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image %files -n libMagick++%{libspec}-%{libver} %defattr(-,root,root) %doc LICENSE -%{_libdir}/libMagick++%{libspec}.so.%{libver}* +%{_libdir}/libMagick++*.so.%{libver}* %files -n libMagick++-devel %defattr(-,root,root) %doc LICENSE %doc Magick++/demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS -%{_libdir}/libMagick++%{libspec}.so -%{_includedir}/ImageMagick/Magick++.h -%{_includedir}/ImageMagick/Magick++ +%{_libdir}/libMagick++*.so +%{_includedir}/ImageMagick*/Magick++.h +%{_includedir}/ImageMagick*/Magick++ %{_bindir}/Magick++-config %{_libdir}/pkgconfig/ImageMagick++*.pc %{_libdir}/pkgconfig/Magick++*.pc @@ -387,4 +389,35 @@ %description doc HTML documentation for ImageMagick library and scene examples. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %changelog ++++++ ImageMagick-6.6.8.9-doc.patch ++++++ --- /var/tmp/diff_new_pack.3H6tgD/_old 2013-04-05 07:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.3H6tgD/_new 2013-04-05 07:46:23.000000000 +0200 @@ -2,11 +2,11 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -2973,7 +2973,7 @@ AC_SUBST(FILTER_PATH) +@@ -3075,7 +3075,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files --DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" +-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" +DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}" DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" ++++++ ImageMagick-6.8.2-4.tar.bz2 -> ImageMagick-6.8.4-0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-6.8.2-4.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-6.8.4-0.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.8.4.0-dont-build-in-install.patch ++++++ perl Makefile.PL always regenerates Makefile Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am =================================================================== --- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am +++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am @@ -57,9 +57,8 @@ PERLMAGICK_CHECKSCRPTS = $(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -install-exec-perl: $(PERLMAKEFILE) - ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ - $(MAKE) CC='@CC@' install ) +install-exec-perl: + ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install ) all-perl: perl-sources ++++++ ImageMagick-6.8.4.0-rpath.patch ++++++ Index: ImageMagick-6.8.4-0/PerlMagick/Makefile.am =================================================================== --- ImageMagick-6.8.4-0.orig/PerlMagick/Makefile.am +++ ImageMagick-6.8.4-0/PerlMagick/Makefile.am @@ -70,7 +69,7 @@ check-perl: $(PERLMAKEFILE) cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test perl-build: $(PERLMAKEFILE) - ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' ) + ( cd $(PERLMAGICK) && sed -i 's:LD_RUN_PATH:DIE_RPATH_DIE:' Makefile quantum/Makefile && $(MAKE) CC='@CC@' ) else if WITH_PERL_STATIC ++++++ ImageMagick-6.8.4.0-test-signatures.patch ++++++ I get the same signatures for quantum depth 8 as in http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.5.8/PerlMagick/t/montage.t http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.5.8/PerlMagick/t/write.t in these four tests. For quantum depth 16, the signatures are correct. Index: ImageMagick-6.8.4-0/PerlMagick/t/montage.t =================================================================== --- ImageMagick-6.8.4-0.orig/PerlMagick/t/montage.t +++ ImageMagick-6.8.4-0/PerlMagick/t/montage.t @@ -153,7 +153,7 @@ testMontage( q/bordercolor=>'blue', matt testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, q/background=>'#696e7e',, tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/, - '61645a8c80a7220a4260133a2b1ae720bf2755f2ed880a3fef0e9453641f5b79', + 'd4de864f9004b185297c9c2351f811aaeb779095bdd8fd5f29bcfbee79f09da4', 'bcd96dabb454c5d25091422763b1cdecb6a69a9b02b84a5b7fa0a70f150b957c', '079a08058fa670d60be858828a42732a2a6e1a4c34f2d179661b0fb71f719219'); @@ -164,7 +164,7 @@ testMontage( q/bordercolor=>'blue', matt testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, q/background=>'#696e7e',, tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/, - '4655b59218afbd58d24a9ecf162a42868b3de40ecc8e9f9671dccf8b17e1aa33', + '8418407b6d56d2c1b67bc735004794d9eb20609d30115a93255eefcad3499e95', '9209b2db884fa4730eeab6c410b90e094fa305635baab7ede17270c13f6e80ad', '877a7277907a804286062823461c37690edaaa5d0bc7b813989bcaa0d4ebeaaf'); Index: ImageMagick-6.8.4-0/PerlMagick/t/write.t =================================================================== --- ImageMagick-6.8.4-0.orig/PerlMagick/t/write.t +++ ImageMagick-6.8.4-0/PerlMagick/t/write.t @@ -72,14 +72,14 @@ print("CompuServe graphics interchange f testReadWrite( 'GIF:input.gif', 'GIF:output.gif', q//, - '0c2e3c82fd375360fba16258bfa83e35b8c878fd208da9818b50e423426cc437'); + '5a25065144213cd0230b7572bd9aef0e447c23a0622193a94ae62c9895c44bf7'); print("CompuServe graphics interchange format (1987) ...\n"); ++$test; testReadWrite( 'GIF87:input.gif87', 'GIF87:output.gif87', q//, - 'b68fe02737630f219fbf1f9ef3f24cf2b73c21848443a02df2cc2c0212a65657'); + '0138e1e5c9a7ed1604ec5bbe8c22378b84fcd9abb8c36e984b051f9efc14d54e'); print("Magick image file format ...\n"); ++$test; ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.3H6tgD/_old 2013-04-05 07:46:23.000000000 +0200 +++ /var/tmp/diff_new_pack.3H6tgD/_new 2013-04-05 07:46:23.000000000 +0200 @@ -1,6 +1,11 @@ -libMagickCore-Q8-7 -libMagickWand-Q8-7 +libMagickCore-6_Q8-1 +libMagickWand-6_Q8-1 +libMagick++-6_Q8-1 ImageMagick-devel requires -ImageMagick-<targettype> - requires "libMagickCore-Q8-7-<targettype> = <version>" - requires "libMagickWand-Q8-7-<targettype> = <version>" + requires "libMagickCore-6_Q8-1-<targettype> = <version>" + requires "libMagickWand-6_Q8-1-<targettype> = <version>" +libMagick++-devel + requires -ImageMagick-<targettype> + requires "libMagick++-6_Q8-1-<targettype> = <version>" + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
