[GraphicsMagick] 1.3.16-1

[Rex Dieter]

commit bc27727ec063cc3b6332e525d0ff1c0718ccee57
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jun 24 11:38:16 2012 -0500

    1.3.16-1
    
    - GraphicsMagick-1.3.16
    - GraphicsMagick-devel and GraphicsMagick-c++-devel multilib conflict (#566361)

 .gitignore                           |    3 +-
 GraphicsMagick-1.3.16-multilib.patch |   43 ++++++++++++++++++++++++++++++++++
 GraphicsMagick.spec                  |   27 ++++++++++++++-------
 sources                              |    2 +-
 4 files changed, 63 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 444ff81..e8af774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/GraphicsMagick-1.3.14.tar.xz
-/GraphicsMagick-1.3.15.tar.xz
+/GraphicsMagick-1.3.16.tar.xz
diff --git a/GraphicsMagick-1.3.16-multilib.patch b/GraphicsMagick-1.3.16-multilib.patch
new file mode 100644
index 0000000..e3c8e90
--- /dev/null
+++ b/GraphicsMagick-1.3.16-multilib.patch
@@ -0,0 +1,43 @@
+diff -up GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in.multilib GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in
+--- GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in.multilib	2011-11-12 14:39:22.000000000 -0600
++++ GraphicsMagick-1.3.16/Magick++/bin/GraphicsMagick++-config.in	2012-06-24 11:25:12.603862643 -0500
+@@ -33,13 +33,13 @@ while test $# -gt 0; do
+       echo '@MAGICK_API_CPPFLAGS@'
+       ;;
+     --cxxflags)
+-      echo '@CXXFLAGS@'
++      echo ''
+       ;;
+     --ldflags)
+-      echo '@MAGICK_API_LDFLAGS@'
++      echo ''
+       ;;
+     --libs)
+-      echo '-lGraphicsMagick++ @MAGICK_API_LIBS@'
++      echo '-lGraphicsMagick++'
+       ;;
+     *)
+       echo "${usage}" 1>&2
+diff -up GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in.multilib GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in
+--- GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in.multilib	2011-11-12 14:39:26.000000000 -0600
++++ GraphicsMagick-1.3.16/magick/GraphicsMagick-config.in	2012-06-24 11:14:55.947571850 -0500
+@@ -30,16 +30,16 @@ while test $# -gt 0; do
+       echo @PACKAGE_VERSION@
+       ;;
+     --cflags)
+-      echo '@CFLAGS@'
++      echo ''
+       ;;
+     --cppflags)
+       echo '@MAGICK_API_CPPFLAGS@'
+       ;;
+     --ldflags)
+-      echo '@MAGICK_API_LDFLAGS@'
++      echo ''
+       ;;
+     --libs)
+-      echo '@MAGICK_API_LIBS@'
++      echo '-lGraphicsMagick'
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index cf6cdfa..a681e59 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -6,14 +6,17 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.15
-Release: 3%{?dist}
+Version: 1.3.16
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
 Url: http://www.graphicsmagick.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# workaround multilib conflicts with GraphicsMagick-config
+Patch1: GraphicsMagick-1.3.16-multilib.patch
+
 ## upstreamable patches
 Patch50: GraphicsMagick-1.3.14-perl_linkage.patch
 
@@ -104,6 +107,7 @@ however.
 %prep
 %setup -q
 
+%patch1 -p1 -b .multilib
 %patch50 -p1 -b .perl_linkage
 
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
@@ -177,19 +181,19 @@ rm -vf  %{buildroot}%{_libdir}/lib*.la
 %define wordsize 32
 %endif
 
-mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h \
-   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config-%{wordsize}.h
+mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h \
+   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{wordsize}.h
 
-cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h <<EOF
-#ifndef ORBIT_MULTILIB
-#define ORBIT_MULTILIB
+cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
+#ifndef MAGICK_TYPES_MULTILIB
+#define MAGICK_TYPES_MULTILIB
 
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
-# include "magick_config-32.h"
+# include "magick/magick_types-32.h"
 #elif __WORDSIZE == 64
-# include "magick_config-64.h"
+# include "magick/magick_types-64.h"
 #else
 # error "unexpected value for __WORDSIZE macro"
 #endif
@@ -258,6 +262,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jun 24 2012 Rex Dieter <rdieter at fedoraproject.org>
+- 1.3.16-1
+- GraphicsMagick-1.3.16
+- GraphicsMagick-devel and GraphicsMagick-c++-devel multilib conflict (#566361)
+
 * Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 1.3.15-3
 - Perl 5.16 rebuild
 
diff --git a/sources b/sources
index 637e61a..1200631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc9cc834d967e9a06f27b5dd27250b31  GraphicsMagick-1.3.15.tar.xz
+41005968939a3d3e92a0728ea2a48e88  GraphicsMagick-1.3.16.tar.xz