OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=10

ImageMagick-6.3.5-10.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
-size 7571418

ImageMagick-6.3.5.10-doc.patch

@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -1976,7 +1976,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'

ImageMagick-6.3.7-2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d984ac3e0139ff95756384b8a843d5612261b4cf4aa03ffeefe404746002c5c3
+size 7358146

ImageMagick-6.3.7.2-doc.patch

@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -2132,7 +2132,7 @@
+ 
+ #
+ # 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.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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]
+
 -------------------------------------------------------------------
 Mon Oct  8 14:20:12 CEST 2007 - pth@suse.de
 

ImageMagick.spec

@@ -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 @@ Provides:       imagemag
 License:        Any permissive
 Group:          Productivity/Graphics/Other
 AutoReqProv:    on
-Version:        6.3.5.10
+Version:        6.3.7.2
-Release:        4
+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 @@ AutoReqProv:    on
 
 %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:<config.h>:<magick/magick-config.h>:" 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 CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
-%if %suse_version > 1000
+%if %suse_version <= 1030
-  export CFLAGS="$CFLAGS -fstack-protector-all"
+# openmp does not work with perl module
-  export CFLAGS="$CXXFLAGS -fstack-protector-all"
+  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 \
+	 --with-threads --without-perl --disable-static  \
-	 --enable-libtool-verbose
+	 --enable-libtool-verbose --with-djvu=yes $OPENMP
-# openmp does not work with perl module
 make %{?jobs:-j%jobs} all
 cd PerlMagick
 perl Makefile.PL
@@ -125,8 +127,11 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 ./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 @@ Authors:
     Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
 %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