rpms/imlib2/devel imlib2-1.3.0-multilib.patch, NONE, 1.1 imlib2.spec, 1.23, 1.24

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29364

Modified Files:
	imlib2.spec 
Added Files:
	imlib2-1.3.0-multilib.patch 
Log Message:
* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at 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


imlib2-1.3.0-multilib.patch:

--- NEW FILE imlib2-1.3.0-multilib.patch ---
--- 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 at libdir@
-      echo $libdirs -lImlib2 @my_libs@
+      echo -lImlib2 @my_libs@
       ;;
     *)
       echo "${usage}" 1>&2


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imlib2.spec	24 Oct 2006 20:25:51 -0000	1.23
+++ imlib2.spec	26 Oct 2006 22:22:38 -0000	1.24
@@ -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 @@
 %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 @@
 
 
 %changelog
+* Thu Oct 26 2006 Hans de Goede <j.w.r.degoede at 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 at hhs.nl> 1.3.0-1
 - New upstream release 1.3.0