Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2012-03-29 07:42:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-02-16 16:16:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2012-03-29 07:42:41.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Mar 27 16:20:53 UTC 2012 - pgaj...@suse.com + +- cleanup the package +- updated to 6.7.6.1: fixes + * CVE-2012-0247 [bnc#746880] + * CVE-2012-0248 [bnc#746880] + * CVE-2012-1185 [bnc#752879] + * CVE-2012-1186 [bnc#752879] + +------------------------------------------------------------------- +Fri Mar 9 9:4:11 UTC 2012 - giecr...@stegny.2a.pl + +- moved the libtool archives to the main package +- separated the bulk documentation +- added a regression %check for the locale comma crash + +------------------------------------------------------------------- Old: ---- ImageMagick-6.6.9.1-inc-struct.diff ImageMagick-6.7.4-7.tar.bz2 xtp-5.4.3.tar.bz2 New: ---- ImageMagick-6.7.6-1.tar.bz2 ImageMagick-6.7.6.1-no-dist-lzip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.1LnK73/_old 2012-03-29 07:42:43.000000000 +0200 +++ /var/tmp/diff_new_pack.1LnK73/_new 2012-03-29 07:42:43.000000000 +0200 @@ -15,21 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%bcond_with xtp -%bcond_without DCraw -%bcond_without FreeType -%bcond_without CXX -%bcond_without Ghostscript -%bcond_without LCMS -%bcond_without TIFF -%bcond_without WMF -%bcond_without XML -%bcond_without DejaVu -%bcond_without EXIF -%bcond_without JPEG -%bcond_without WEBP -# build against librsvg [bnc#724222] -%bcond_without RSVG + Name: ImageMagick @@ -38,63 +24,24 @@ BuildRequires: libtool BuildRequires: lzma-devel BuildRequires: pkgconfig -%if %{with DCraw} BuildRequires: dcraw -%endif - -%if %{with FreeType} BuildRequires: freetype2-devel -%endif - -%if %{with CXX} BuildRequires: gcc-c++ -%endif - -%if %{with Ghostscript} BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library -%endif - -%if %{with LCMS} BuildRequires: liblcms2-devel -%endif - -%if %{with TIFF} BuildRequires: libtiff-devel -%endif - -%if %{with WMF} BuildRequires: libwmf-devel -%endif - -%if %{with XML} BuildRequires: libxml2-devel -%endif - -%if %{with DejaVu} BuildRequires: libdjvulibre-devel -%endif - -%if %{with EXIF} BuildRequires: libexif-devel -%endif - -%if %{with JPEG} BuildRequires: libjasper-devel -%endif - -%if %{with WEBP} BuildRequires: libwebp-devel -%endif - -%if %{with RSVG} BuildRequires: librsvg-devel -%endif -%define xtp_version 5.4.3 -%define mfr_version 6.7.4 -%define mfr_revision 7 +%define mfr_version 6.7.6 +%define mfr_revision 1 %define source_version %{mfr_version}-%{mfr_revision} Version: %{mfr_version}.%{mfr_revision} Release: 0 @@ -106,19 +53,11 @@ Source: ImageMagick-%{source_version}.tar.bz2 # To get mtime of file Source1: ImageMagick.changes -%if %{with xtp} -Source2: xtp-%{xtp_version}.tar.bz2 -%endif -Source3: baselibs.conf +Source2: baselibs.conf Patch1: ImageMagick-6.6.8.9-examples.patch Patch2: ImageMagick-6.6.8.9-doc.patch -# remove inc-struct.diff as soon as it will be not comfortable to port -# see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include -# for upstream progress -Patch3: ImageMagick-6.6.9.1-inc-struct.diff +Patch3: ImageMagick-6.7.6.1-no-dist-lzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: imagemag = %{version} -Obsoletes: imagemag < %{version} %package -n perl-PerlMagick Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} @@ -160,17 +99,12 @@ Summary: C++ Interface for ImageMagick - runtime library License: SUSE-ImageMagick Group: Development/Libraries/C and C++ -# was last used in openSUSE 10.2 -Provides: ImageMagick-Magick++ = %{version} -Obsoletes: ImageMagick-Magick++ < %{version} %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development License: SUSE-ImageMagick Group: Development/Libraries/C and C++ -Provides: ImageMagick-Magick++-devel = %{version} -Obsoletes: ImageMagick-Magick++-devel < %{version} %package doc Summary: Document Files for ImageMagick Library @@ -181,45 +115,21 @@ %endif %prep -rm -rf xtp-%{xtp_version} -%if %{with xtp} -%setup -n ImageMagick-%{source_version} -b 2 -%else %setup -n ImageMagick-%{source_version} -%endif %patch1 %patch2 %patch3 -p1 -# remove together with inc-struct.diff ---- -echo>header-test.c '#include "wand.h"' # -echo>wand.h '#include "wand/MagickWand.h"' # -%{__make} header-test.o # %build -%define CFLAGS ${RPM_OPT_FLAGS} -%define LDFLAGS -L%{_libdir} -%define system_ltdl 0 -%if %system_ltdl -cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl -mv ltdl/ltdl.c ltdl/ltdl.c.orig -sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c -%endif +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="-L%{_libdir}" 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 -%if %{with xtp} -pushd ../xtp-%{xtp_version} -autoreconf --force --install -popd -%endif - -%if %{suse_version} <= 1030 -# openmp does not work with perl module - OPENMP="--disable-openmp" -%endif %configure --with-pic \ --enable-shared \ --without-frozenpaths \ @@ -228,17 +138,12 @@ --with-threads \ --without-perl \ --disable-static \ - --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" + --with-djvu=yes \ + --with-wmf=yes make %{?_smp_mflags} all cd PerlMagick perl Makefile.PL make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" -# -%if %{with xtp} -cd ../../xtp-%{xtp_version} -%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}" -make %{?_smp_mflags} -%endif %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs @@ -262,12 +167,6 @@ %{__mv} demo/makefile.2 demo/Makefile cd .. -%if %{with xtp} -pushd ../xtp-%{xtp_version} - %{__make} DESTDIR=$RPM_BUILD_ROOT install -popd -%endif - %{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml %{__cp} -a -t "${RPM_BUILD_ROOT}"'%{_defaultdocdir}/%{name}/' scenes PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ @@ -359,9 +258,6 @@ %doc LICENSE %doc PerlMagick/README.txt %doc PerlMagick/demo -%if %suse_version < 1140 -/var/adm/perl-modules/ImageMagick -%endif %doc %{_mandir}/man3/Image::Magick.3pm* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image @@ -387,12 +283,6 @@ %files doc %defattr(-,root,root) %dir %{_docdir}/%{name} -%if 0 -%{_docdir}/%{name}/index.html -%{_docdir}/%{name}/www -%{_docdir}/%{name}/images -%{_docdir}/%{name}/scenes -%endif %description ImageMagick is a robust collection of tools and libraries to read, @@ -492,6 +382,11 @@ + + + + + ++++++ ImageMagick-6.7.4-7.tar.bz2 -> ImageMagick-6.7.6-1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-6.7.4-7.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-6.7.6-1.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.7.6.1-no-dist-lzip.patch ++++++ Index: ImageMagick-6.7.6-1/configure.ac =================================================================== --- ImageMagick-6.7.6-1.orig/configure.ac +++ ImageMagick-6.7.6-1/configure.ac @@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK -AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) +AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
