diff --git a/ImageMagick-6.5.4-8.tar.bz2 b/ImageMagick-6.5.4-8.tar.bz2 deleted file mode 100644 index b6642e3..0000000 --- a/ImageMagick-6.5.4-8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:579dd2729c24ce80931f6e1103fadbfaa6a9c5a305058a953de09b32d5b2488e -size 8819017 diff --git a/ImageMagick-6.5.7-9.tar.bz2 b/ImageMagick-6.5.7-9.tar.bz2 new file mode 100644 index 0000000..3699d05 --- /dev/null +++ b/ImageMagick-6.5.7-9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a423bae09a77b0e8d335cca11a242fd63ddb56847f7e3d1bacf26bcedbd7cce0 +size 8716394 diff --git a/ImageMagick-6.5.4.8-doc.patch b/ImageMagick-6.5.7.9-doc.patch similarity index 65% rename from ImageMagick-6.5.4.8-doc.patch rename to ImageMagick-6.5.7.9-doc.patch index dc0c624..a64a2a1 100644 --- a/ImageMagick-6.5.4.8-doc.patch +++ b/ImageMagick-6.5.7.9-doc.patch @@ -1,6 +1,8 @@ ---- configure.ac +Index: configure.ac +=================================================================== +--- configure.ac.orig +++ configure.ac -@@ -2325,7 +2325,7 @@ +@@ -2544,7 +2544,7 @@ AC_SUBST(FILTER_PATH) # # Path to ImageMagick documentation files @@ -8,4 +10,4 @@ +DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}" DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}" DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/" - if test "$native_win32_build" = 'yes'; then + case "${build_os}" in diff --git a/ImageMagick-6.5.4.8-examples.patch b/ImageMagick-6.5.7.9-examples.patch similarity index 100% rename from ImageMagick-6.5.4.8-examples.patch rename to ImageMagick-6.5.7.9-examples.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index c782c63..33373f2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 23 15:49:23 CET 2009 - pgajdos@suse.cz + +- updated to 6.5.7-9 (See ChangeLog) + +------------------------------------------------------------------- +Tue Nov 3 19:09:20 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Aug 24 12:25:34 CEST 2009 - pgajdos@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index 604011c..da365cc 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -31,11 +31,12 @@ Provides: imagemag License: PERMISSIVE-OSI-COMPLIANT Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.5.4.8 -Release: 2 +Version: 6.5.7.9 +%define source_version 6.5.7-9 +Release: 3 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org -Source: ImageMagick-6.5.4-8.tar.bz2 +Source: ImageMagick-%{source_version}.tar.bz2 Source2: xtp-%{xtp_version}.tar.bz2 Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch @@ -104,7 +105,7 @@ Requires: ImageMagick = %{version} %prep rm -rf xtp-%{xtp_version} -%setup -n ImageMagick-6.5.4-8 -b 2 +%setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2