Hello community,
here is the log from the commit of package ImageMagick
checked in at Sun Dec 2 15:57:15 CET 2007.
--------
--- ImageMagick/ImageMagick.changes 2007-10-08 14:21:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick.changes 2007-11-30 16:53:00.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 30 16:50:35 CET 2007 - nadvornik@suse.cz
+
+- updated to 6.3.7-2, see ChangeLog for details
+ * fixes conflicts in header files [#340485]
+
+-------------------------------------------------------------------
Old:
----
ImageMagick-6.3.5.10-autoconf.patch
ImageMagick-6.3.5.10-doc.patch
ImageMagick-6.3.5.10-examples.patch
ImageMagick-6.3.5-10.tar.bz2
New:
----
ImageMagick-6.3.7.2-autoconf.patch
ImageMagick-6.3.7.2-doc.patch
ImageMagick-6.3.7.2-examples.patch
ImageMagick-6.3.7-2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ImageMagick.spec ++++++
--- /var/tmp/diff_new_pack.U14989/_old 2007-12-02 15:53:25.000000000 +0100
+++ /var/tmp/diff_new_pack.U14989/_new 2007-12-02 15:53:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package ImageMagick (Version 6.3.5.10)
+# spec file for package ImageMagick (Version 6.3.7.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: ImageMagick
BuildRequires: dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std
-BuildRequires: ghostscript-library glib libdjvulibre-devel liblcms-devel libtiff-devel libwmf-devel
+BuildRequires: ghostscript-devel ghostscript-library glib libdjvulibre-devel liblcms-devel libtiff-devel libwmf-devel
BuildRequires: libxml2-devel pkgconfig
%if %suse_version > 1020
BuildRequires: libexif-devel libjasper-devel
@@ -27,11 +27,11 @@
License: Any permissive
Group: Productivity/Graphics/Other
AutoReqProv: on
-Version: 6.3.5.10
-Release: 4
+Version: 6.3.7.2
+Release: 1
Summary: Viewer and Converter for Images
Url: http://www.imagemagick.org
-Source: ImageMagick-6.3.5-10.tar.bz2
+Source: ImageMagick-6.3.7-2.tar.bz2
Source2: xtp-%{xtp_version}.tar.bz2
Patch1: ImageMagick-%{version}-examples.patch
Patch2: ImageMagick-%{version}-doc.patch
@@ -88,32 +88,34 @@
%prep
rm -rf xtp-%{xtp_version}
-%setup -n ImageMagick-6.3.5 -b 2
+%setup -n ImageMagick-6.3.7 -b 2
%patch1
%patch2
%patch3
%build
+%define system_ltdl 0
+%if %system_ltdl
cp -f /usr/share/libtool/libltdl/*.{c,h} ltdl
mv ltdl/ltdl.c ltdl/ltdl.c.orig
sed -e "s:::" ltdl/ltdl.c.orig >ltdl/ltdl.c
+%endif
autoreconf --force --install
pushd ../xtp-%{xtp_version}
autoreconf --force --install
popd
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-%if %suse_version > 1000
- export CFLAGS="$CFLAGS -fstack-protector-all"
- export CFLAGS="$CXXFLAGS -fstack-protector-all"
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
+export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
+%if %suse_version <= 1030
+# openmp does not work with perl module
+ OPENMP="--disable-openmp"
%endif
export LDFLAGS="-L%{_libdir}"
./configure --prefix=%{prefix} --libdir=%{_libdir} \
--mandir=%{_mandir} --enable-shared --without-frozenpaths \
--with-largefiles --with-magick_plus_plus --with-modules\
- --with-threads --without-perl --disable-static --disable-openmp \
- --enable-libtool-verbose
-# openmp does not work with perl module
+ --with-threads --without-perl --disable-static \
+ --enable-libtool-verbose --with-djvu=yes $OPENMP
make %{?jobs:-j%jobs} all
cd PerlMagick
perl Makefile.PL
@@ -125,8 +127,11 @@
./configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir}
make %{?jobs:-j%jobs}
+%check
+cd PerlMagick
+make test
+
%install
-rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
make install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -385,6 +390,9 @@
Bob Friesenhahn
%changelog
+* Fri Nov 30 2007 - nadvornik@suse.cz
+- updated to 6.3.7-2, see ChangeLog for details
+ * fixes conflicts in header files [#340485]
* Mon Oct 08 2007 - pth@suse.de
- Add libMagick10 to Requires of perl-PerlMagick (#331611)
* Tue Sep 25 2007 - nadvornik@suse.cz
++++++ ImageMagick-6.3.5.10-autoconf.patch -> ImageMagick-6.3.7.2-autoconf.patch ++++++
++++++ ImageMagick-6.3.5.10-doc.patch -> ImageMagick-6.3.7.2-doc.patch ++++++
--- ImageMagick/ImageMagick-6.3.5.10-doc.patch 2005-09-21 15:07:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick-6.3.7.2-doc.patch 2007-11-26 17:34:44.000000000 +0100
@@ -1,11 +1,11 @@
--- configure.ac
+++ configure.ac
-@@ -1976,7 +1976,7 @@
+@@ -2132,7 +2132,7 @@
#
- # Path to ImageMagick document files
--MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+MagickDocumentSubdir="packages/${PACKAGE_NAME}"
- MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
- MagickDocumentPathDefine="${MagickDocumentPath}/"
- if test "$native_win32_build" = 'yes'
+ # Path to ImageMagick documentation files
+-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}"
+ DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+ if test "$native_win32_build" = 'yes'; then
+ DOCUMENTATION_PATH=`$WinPathScript "$DOCUMENTATION_PATH" 1`
++++++ ImageMagick-6.3.5.10-examples.patch -> ImageMagick-6.3.7.2-examples.patch ++++++
++++++ ImageMagick-6.3.5-10.tar.bz2 -> ImageMagick-6.3.7-2.tar.bz2 ++++++
ImageMagick/ImageMagick-6.3.5-10.tar.bz2 /mounts/work_src_done/STABLE/ImageMagick/ImageMagick-6.3.7-2.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org