(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 14e163d5b49359302477da1d310147d1b3f85f84..2c5742ae9a3b301b978079b8d5275cf555b9bcf0 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -208,9 +208,6 @@ if [ -z perl-pkg-files ] ; then
     exit -1
 fi
 
-# These don't belong here, we include them in %%doc
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VERSION}/{ChangeLog,LICENSE,NEWS.txt}
-
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 alpha sparc64
 %define wordsize 64

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index cc57d987496836815729c302116adce540eda1ed..79f794600e19398ca18b7bb3da952a01c3a7a657 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -208,9 +208,6 @@ if [ -z perl-pkg-files ] ; then
     exit -1
 fi
 
-# These don't belong here, we include them in %%doc
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VERSION}/{ChangeLog,LICENSE,NEWS.txt}
-
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 alpha sparc64
 %define wordsize 64

diff --git a/Makefile.am b/Makefile.am
index e19776d988739c2cdd47564bb13dacf3fbd92cdb..e4de3c7a9f5e8dc1a7a4c058a224afc198c64433 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,7 @@ man_MANS = \
        $(UTILITIES_MANS)
 
 # Architecture independent data files installed in the package's data directory
-docdir = $(SHARE_PATH)
+docdir = $(DOCUMENTATION_PATH)
 doc_DATA = \
        LICENSE \
        ChangeLog \

diff --git a/Makefile.in b/Makefile.in
index d01322ca83c931fb9946d85450991fbdfbc09047..43144d03fd18eedf3716301ce59145af570cad18 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2570,7 +2570,7 @@ datarootdir = @datarootdir@
 dejavu_font_dir = @dejavu_font_dir@
 
 # Architecture independent data files installed in the package's data directory
-docdir = $(SHARE_PATH)
+docdir = $(DOCUMENTATION_PATH)
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 freetype_config = @freetype_config@

diff --git a/config/configure.xml b/config/configure.xml
index ba087ec40aae0c57324156ab1537cc225025d19e..1f4788e941db554d80c689131218a66263143e1f 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,2"/>
-  <configure name="SVN_REVISION" value="4079" />
-  <configure name="RELEASE_DATE" value="2011-03-29"/>
+  <configure name="SVN_REVISION" value="4111" />
+  <configure name="RELEASE_DATE" value="2011-03-30"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 52a790dc8592ec868681a12988f7245ab2fa59e3..41b07550eb80a9de8ca7392c6527c551162396c5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3451,7 +3451,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=4079
+MAGICK_SVN_REVISION=4111
 
 
 

diff --git a/magick/version.h b/magick/version.h
index 2aab3db91e9727ff1bc82cf317b60a98f522db4c..fb7cdf43b02e9890939e943ea9b582d9e634e8fb 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4079"
+#define MagickSVNRevision  "4111"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-2"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-03-29"
-#define MagickChangeDate   "20110329"
+#define MagickReleaseDate  "2011-03-30"
+#define MagickChangeDate   "20110330"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "