From 7efdd41e25dfde1efc24d53dabf94b0a54a420ed Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Thu, 26 Oct 2006 22:22:38 +0000
Subject: [PATCH] - Multilib devel goodness (make -devel i386 and x86_64
 parallel     installable) - Fix bug 212469 - Add libid3tag-devel to the BR's
 so id3tag support gets build in

---
 imlib2-1.3.0-multilib.patch | 34 ++++++++++++++++++++++++++++++++++
 imlib2.spec                 | 18 +++++++++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 imlib2-1.3.0-multilib.patch

diff --git a/imlib2-1.3.0-multilib.patch b/imlib2-1.3.0-multilib.patch
new file mode 100644
index 0000000..bf20823
--- /dev/null
+++ b/imlib2-1.3.0-multilib.patch
@@ -0,0 +1,34 @@
+--- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
++++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
+@@ -190,7 +190,7 @@
+   AC_PATH_XTRA
+   x_dir=${x_dir:-/usr/X11R6}
+   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++  x_libs="-lX11 -lXext"
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+--- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
++++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
+@@ -23117,7 +23117,7 @@
+ 
+   x_dir=${x_dir:-/usr/X11R6}
+   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++  x_libs="-lX11 -lXext"
+ 
+ 
+ if true; then
+--- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
++++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
+@@ -45,8 +45,7 @@
+       echo $includes
+       ;;
+     --libs)
+-      libdirs=-L@libdir@
+-      echo $libdirs -lImlib2 @my_libs@
++      echo -lImlib2 @my_libs@
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/imlib2.spec b/imlib2.spec
index fbf21b4..8455da6 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -1,16 +1,17 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
 Patch0:		imlib2-1.2.1-X11-path.patch
+Patch1:         imlib2-1.3.0-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel pkgconfig
+BuildRequires:	giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:	libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
 Summary:	Development package for %{name}
@@ -43,6 +44,12 @@ flexible.
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
+%patch1 -p1 -b .multilib
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
 
 
 %build
@@ -107,6 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.3.0-2
+- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
+- Fix bug 212469
+- Add libid3tag-devel to the BR's so id3tag support gets build in
+
 * Tue Oct 24 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.3.0-1
 - New upstream release 1.3.0