(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index be43559385f58afc141e8ac453bd990d582a63bc..df897e62e11d736b5e9da510f862d047d480bda8 100644 (file)
--- 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 07ef6bcc571b67bbea02eb5c12997b9a27f98431..b6dbbb721d66e8c8d5dc4a8a833de38ccab94552 100644 (file)
--- 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 f3ff39272e3837acd90885ce88b2a6e1c19ecefc..c16e39e6fe38fa1d96a3f5153f8797b1e8f77994 100644 (file)
--- 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 78cf0175299df87e4203c93bc64e8194ecb45366..aa5624c816121f8623e9a64511fa7a18356bce99 100644 (file)
--- 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 1800c598af2c8b7c4ec8b3e93a23e74249fbec9a..de970a92c4954d4fb7d8c74dc27fdba7a8d9a3dc 100755 (executable)
--- 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 946f71f0af1417b30c9be4be7e9855349a7de2d2..010107dee9f625bca984e9d2a9a49ad472d3201c 100755 (executable)
--- 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