From db968bb6be81fdd8e119ff950c240473fd4b1472 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jul 19 2013 08:21:01 +0000
Subject: Fixed multilib conflict in devel package (by multilib-fix patch)


- Removed rpaths

---

diff --git a/autotrace-0.31.1-multilib-fix.patch b/autotrace-0.31.1-multilib-fix.patch
new file mode 100644
index 0000000..1950c2c
--- /dev/null
+++ b/autotrace-0.31.1-multilib-fix.patch
@@ -0,0 +1,20 @@
+diff -up autotrace-0.31.1/autotrace-config.in.orig autotrace-0.31.1/autotrace-config.in
+--- autotrace-0.31.1/autotrace-config.in.orig	2002-11-08 19:18:31.000000000 +0100
++++ autotrace-0.31.1/autotrace-config.in	2013-07-19 10:05:14.516133368 +0200
+@@ -4,6 +4,7 @@ af_libs=
+ af_cflags=
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
++libdir=`pkg-config --variable=libdir autotrace`
+ 
+ 
+ ##
+@@ -205,7 +206,7 @@ fi
+ #dummy because this should always be selected
+ 
+ af_cflags="$af_cflags -I@includedir@"
+-af_libs="-L@libdir@ -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs"
++af_libs="-L$libdir -lautotrace @LIBPNG_LDFLAGS@ @MAGICK_LDFLAGS@ @LIBSWF_LDFLAGS@ @LIBPSTOEDIT_LIBS@ $af_libs"
+ 
+ 
+ 
diff --git a/autotrace.spec b/autotrace.spec
index d44c341..d236b91 100644
--- a/autotrace.spec
+++ b/autotrace.spec
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        34%{?dist}
+Release:        35%{?dist}
 Summary:        Utility for converting bitmaps to vector graphics
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+
@@ -11,6 +11,7 @@ Patch2:         autotrace-0002-Fixed-underquoted-AM_PATH_AUTOTRACE-definition.pa
 Patch3:         autotrace-0003-libpng-fix.patch
 # Sent upstream
 Patch4:         autotrace-0.31.1-CVE-2013-1953.patch
+Patch5:         autotrace-0.31.1-multilib-fix.patch
 BuildRequires:  ImageMagick-devel
 BuildRequires:  libpng-devel > 2:1.2
 BuildRequires:  libexif-devel
@@ -49,9 +50,15 @@ This package contains header files and development libraries for autotrace.
 %patch2 -p1 -b .aclocal18
 %patch3 -p1 -b .libpng15
 %patch4 -p1 -b .CVE-2013-1953
+%patch5 -p1 -b .multilib-fix
 
 %build
 %configure
+
+# remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
@@ -83,6 +90,10 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 
 %changelog
+* Fri Jul 19 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-35
+- Fixed multilib conflict in devel package (by multilib-fix patch)
+- Removed rpaths
+
 * Fri Jun 28 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 0.31.1-34
 - Fixed buffer overflow when parsing BMP files
   Resolves: CVE-2013-1953