From 9a92f7cf7599bfa2c5e8b27c41eae49646000462 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 16 Nov 2011 15:16:41 +0000
Subject: [PATCH]

---
 ImageMagick.spec     | 6 +++---
 MagickCore/version.h | 4 ++--
 config/configure.xml | 4 ++--
 config/ltmain.sh     | 2 +-
 configure            | 2 +-
 libtool              | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index be4355938..df897e62e 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -2,8 +2,8 @@
 %global Patchlevel  0
 
 Name:           ImageMagick
-Version:        %{VERSION}.%{Patchlevel}
-Release:        1%{?dist}
+Version:        %{VERSION}
+Release:        %{Patchlevel}
 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images.
 Group:          Applications/Multimedia
 License:        http://www.imagemagick.org/script/license.php
@@ -180,7 +180,7 @@ make
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{VERSION}
+cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 07ef6bcc5..b6dbbb721 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5951"
+#define MagickSVNRevision  "5982"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-11-14"
+#define MagickReleaseDate  "2011-11-16"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/config/configure.xml b/config/configure.xml
index f3ff39272..c16e39e6f 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5951" />
-  <configure name="RELEASE_DATE" value="2011-11-14"/>
+  <configure name="SVN_REVISION" value="5982" />
+  <configure name="RELEASE_DATE" value="2011-11-16"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/config/ltmain.sh b/config/ltmain.sh
index 78cf01752..aa5624c81 100644
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -8050,7 +8050,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
+	      *) func_apped perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
diff --git a/configure b/configure
index 1800c598a..de970a92c 100755
--- a/configure
+++ b/configure
@@ -3609,7 +3609,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5951
+MAGICK_SVN_REVISION=5982
 
 
 
diff --git a/libtool b/libtool
index 946f71f0a..010107dee 100755
--- a/libtool
+++ b/libtool
@@ -8490,7 +8490,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath+=" $libdir" ;;
+	      *) func_apped perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
-- 
2.40.0